Where to go from here

I've got to rave about my setup. I started upgrading my system about a year ago after years of raising kids, etc. Had an old Denon 75 turntable with a Luxman arm, Adcom GFA 55 amp, Vandersteen 2ce speakers, dumpy little Sony CD player, Hafler preamp that I built years ago.

Started by changing out the speakers to Quad 22L2, then bought a Rega P3-24 with Elys II, Cary SLP-94L preamp, Cambridge Audio Azur 640 CD player, bought another GFA 555 and am running a vertical bi-amp to the Quads. Then started tweaking, mostly with the turntable because one of the reasons I stopped listening critically to music over the years is because CDs always sounded wrong to me. So, got a Herbie's mat, TTPSU, built a vibration platform with two hardwood boards and squash balls in between with a timbernation maple 2" slab (with adjustable spikes) on top then turntable, changed out the subplatter with a groovetracer and the counterweight with the Mitchell.

Also, got Morrow Audio connectors for the CD and Aurelex Subdudes for the speakers.

Holy Moly, the analog sounds incredible, especially after switching out the subplatter and counterweight. I'm begging people to come in and listen to vinyl. Even my old vinyl, cleaned up on a VPI 16.5 sounds great. I'm in analog heaven. But, even though my CDs now sound better because of the addition of the Cary tube preamp and Morrow interconnects, it still doesn't sound right a lot of the time.

My question: I've spent about 2k on the analog setup. If I spend that much on a CD player, what can I expect? Can I approach the quality sound I am getting from my analog rig?

Thanks for any help you can give me.