I am kind of in the same boat as the OP.
W4S preamp amd amp with Maggie 3.6's. No fancy interconnects or speaker wire - thicker than lamp cord and lets rock. I have an unmodified Technics 1200 table with an Audio Technica 150 mlx cartridge.
For CD's it is a modified AudioSpace CD8A ($1,400)with tubed and solid state output. I have enough ear to hear the difference between the solid state and tubed output and prefer the tubed. More texture, more organic, and more smooth sounding to me with what I am running. And by the way, for me the Sorbathane footers made a noticeable improvement in sound quality for the CD player. Better bass and cleaner overall.
However, the Audio Space is not as "live" sounding as my vinyl setup so I am thinking about upgrading. I had an in house listen with an Esoteric SA50 just a week ago. While the Esoteric ($4-$5K) had a wider soundstage and more detail, the AudioSpace sounded more musical to me with more PRAT. The Esoteric went back.
That led me to think about other solutions like the Oppo 95 or 105. The latest Marantz (SA-11S3 CD/SACD player) is on my short list consdering all of the positive press that the SA-11S2 received.
I do not want to buy the Marantz without hearing it first and therein lies the problem. Its just too much to shell out and then, after hearing it, realize that it was a mistake.
It seems like the sg69's thought about Oppo is a good one given the 95/105 have had good press. The 105 is $1,200 new, so a mistake is going to cost $200-$300 and not a thousand or more. And if it sounds good, then it is off to Modwright to take it up a level.
Now the tricky part - after the Modwright upgrade - you have $3,000 in the Oppo - but what if the Marantz is really better?!