Another suggestion would be to try and find a tube-staged CD player. Good tube CD players can be a bit pricey, but I'm sure you can find some options for less than $1k. There's a Jolida 100 here on Agon for $650 and comes with a built-in headphone amp.
Not sure about the differences between the CD-P or CD-S models. I've only heard the Quad 99 CD-P that a friend had and it was very natural sounding with an excellent midrange. However, he had it hooked up to a Copland amp and was using a pair of Totem Arro speakers, so it must have been just a good overall match.
Hey Roc, nice clean looking system. If you're having a problem with "runaway" or "boomy" bass, would suggest putting in an area rug as a cheap sound-damper. Also, would suggest the Quad 99 CDP to go along with your preamp and amp. Although, it doesn't have a headphone amp.
