Recom. for a new CD/DVD?

I currently have a Sony DVP9000es and I am thinking og getting a new CD/DVD player. I only have the room for one so I need a great player that does both. I was thinking of possibly the Classe dvd1 or the Cary D3. I am currently using the Classe CA-151 amp and Classe ssp-25 pre/processor and B&W N804 with Purist audio colossus cables and Custom power cord power block and power cables.
Thanks