The only thing I would Change is ...trade in the c-15 and the 831 . You might like the sound better by using an MC301 direct to the amplifier! the 301 has an awesome transport and a volume control! I have a 352 and a Mc201 + Mac tends to be pretty warm unless you brighten things up a little with some good Nordost cables ! Love your system.
MM