CD players with volume control ?????


I'm considering a Wadia 830 used to add to my 2 channel system. My only source is CD. I have a Krell KAV 250a with a NAD c160 pre-amp, and an old Phillips CD player hooked up to B&W N805s. I want to eliminate my pre-amp and upgrade my CD, I'm thinking that the Wadia is the way to do it, any thoughts? Are there any other CD players with volume control that allow you to eliminate the pre-amp?

Thanks!
mijknarf
There have been many positive comments on the Opus 21 --

the review on their website mentioned that the CDROM drive makes an audible whining noise (audible when no music is playing). Has anyone noticed that, and has it been a problem, for example, in quiet pssages in the music? Also, is it common to use a CDROM in a cd player, I'm wondering about reliability and quality of the mechanism...?
Well common use of a CDROM is one of the reason they chose it, they dont have to worry about the drive becoming obsolete and not finding replacement parts for their CD players. And I do believe they have changed the CD drive to eliminate the whine. However, the whine is very quiet, and it is difficult to hear at all from 10 feet away.
The drive whine was in older models over a year ago. The new one is dead silent. Can't even hear it when your ear is close.