Upgrade my CD player or futile effort?

I would appreciate you guys input. I listen to 90% vinyl  and 10% CDs due to a lot of new music I get into only comes out on CDs. My analog system sounds fantastic to my ears but unfortunately my digital falls short. My analog system consists of:
-VPI Classic 1 TT
-Lyra Kleos cart
-PS Audio Stellar phono preamp
-Prima Luna 100 preamp
-Parasound Halo A21+ amp
-PBN Montana XPS speakers
-Dual Rythmick
F-12 subs
My CD player is a Marantz CD6005 running through my analog system.
Compared to my vinyl, overall the sound from my CDs lacks the depth and definition in bass, comes short in the soundstage and overall space in presentation and does not have the
same clarity in treble.
If I rate my analog sound a 9, I would rate my digital CD a 7.
My question is, would I benefit from a better CD player, even so the CD6005 is no slouch, or am I gonna end up in a goose chase?
I realize my CDs may never sound as good as my vinyl, but I would try to improve it if you guys think it would be worth the effort. Are there really some outstanding CD players out there that can measure up to vinyl? Personal experiences only please, do not need sales pitches by equipment associations you may have never listened to. Also all my cabling and room setup is a 10 to me with the analog so I wouldn't change any of that for my CD player listening.  Thanks.

B23f4216 5f85 4eb7 97bf ecc1c8d9b377baylinor
You do have a very nice Analog rig. I was always a pro analog guy till 2011 when I went digital. 

My only thought is that you might try a r2r DAC with a tube output stage. You could use your 6005 as a transport. Possible upgrade the transport later should  you find the DAC is taking you in the right direction. 

I own a Audio Mirror Tubadour III DAC, paring it with a CXC transport. The AM is r2r and has a tube output stage. It did much to improve the sonic qualities you are looking for. Can't say how it would compete against analog in your system.

+1 @mesch

Considering the limited choice of CDP's and the # of DACS now offered, this is the way to go for digital, unless you stream. Then too I have heard that often the cdp's sound better than streaming. I can tell you from experience that streaming in not as easy as it sounds unless you put a lot of $$$ into it and the software

Nice analog however digital is all about the DAC. Until you find one you like you are in the weeds.