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!