Upgrade suggestions from McCormack w/SMC mods?

Hi all,

I have been happily listening to my McCormack pre and power combo for a number of years, which have SMC's Gold Mods (DNA125/RLD1) and I purchased used. Definitely nothing better out there I have heard anywhere near what I paid, maybe not at 2x the price. But, I was wondering what DOES sound better than this combo, if anyone has either upgraded from McCormack separates w/SMC mods, or has done some A to B testing? I would be looking at primarily a solid-state amp (don't need tons of power), and possibly a tubed or sweet-sounding SS preamp. I would like to upgrade my system one of these days. I love the way it sounds right now, but after a couple of years, upgrade fever is hitting again. I will keep the McCormack stuff unless I find something that definitely beats it.

The other option is possibly just sending the units back to McCormack to get a Platinum revision and maybe the ARC circuitry.

I was possibly thinking of a Pass XA30.5 and XP10 as a potential upgrade, but no dealers in this area. I do have a McIntosh dealer, and they recommended the MC402 and C2300 combo. I tried a Sim Audio I-7, and it sounded a bit thin in my system: nice, but not at the level of the McCormack stuff I have now. Not sure how much better their separates are.