+1 on Aesthetix gear and Jim White. I had a completely McIntosh top end vintage system and went totally to Aesthetix. I chose SQ over good looking meters bouncing around. I started with Signature models and then upgraded all to Eclipse: Atlas, Janus & Romulus. great improvement in depth, tonality and punch. As mentioned above, replacing the EH and JJ's with NOS took it (for me) to a new level. Especially noticeable with ultra low noise Amperex & Telefunken in the phonostage. The only change I would possibly make is to go monoblock Atlas eclipse.
I cannot say enough good things about Jim and Glen at Aesthetix. Accessible and helpful. Jim once came to my home and we discussed his hybrid design and passion for great sound reproduction at a realistic price point. I demo'd the Metis at home for 2 weeks and it was incredible - but would have had to sell my Janus and buy a separate phonostage, cables, etc so I passed. But it's a great preamp too.