Looking to Upgrade my CDP

Currently using a jolida 100A with 1959 Amperex tubes. The sound is warm with a huge soundstage, but I’m looking to move up to the next level. I’m not interested in computer audio, just a dedicated CD player that will get the most out of my large classical Redbook collection.

I’ve auditioned a Naim CDP and I think it might sound too detailed in my system, so I like the idea of tubes such as a Raysonic or an Ayon. Budget is around $2500 to $3000 new or used.

I’ve learned from many of you on the forum how important the master clock is in preventing jitter, thus leading to a more natural presentation.
I’d like to hear your recommendations keeping in mind I’m looking for focused, open sonics and I hate to use the word, but close to “analogue” sound.

many thanks.