I would nix the CD player as well. But, I would consider looking into a digital music server that you can use instead. If you have multiple zones and really want to manage music for parties and whole house audio, then a digital music server can do the trick. Good servers are designed specifically for music and are just another piece of audio gear you have with a remote and on screen display.
Best - by far - also a bit pricey:
http://www.request.com/us/
Good, fast, solid - very reliable:
http://www.imerge.co.uk/products/improductshtml/ipmain.html
Bang for the buck, lots of nifty little features:
http://www.escient.com
Then, consider making sure the DVD player handles CDs very well in your room so when you want some high quality dedicated music time, you can drop the original CD into your DVD player and really enjoy.
I have found that on $100,000.00+ installations that I have worked on, this is one of the best routes to go. A focus on practicality for the one room and the entire house while providing adaptable and valuable products to enhance the entire listening experience throughout the entire environment - not just one room.
My home: 12+ zones of independent audio - one touch access in each zone.