Jimi_p, one suggestion I would like to make is the use of variable attenuators between your amp and CD player. A couple of companies make them, and I picked up a new pair, with outstanding parts/build quality for $160. Using just one, high quality resistor in the signal path, the sonics are outstanding.
These gives you the flexibility of using any CD player you wish.