Was the CD player a 521 or a 541? I heard the 521i through the NAD (I believe) 320BEE integrated amp through some PSB image 1B's and 5T's and the sound was awesome.
If you uprgade your cd player I would definitely recommend using the analog inputs.