Frankly, I'd make the move to computer audio. Lots of options, but I chose a Mac Mini, running Pure Music. Into a good DAC- of which there are many affordable examples available- it beats the sound of all my CD players. And I've had too many to list, from Sony SACD 1, to Electrocompanient, to Ayre, to Resolution Audio, and on and on.
You'll get lots of opinions of course, but I made the move and have been extremely happy.