Good to hear that you found a satisfactory way to upgrade your sound. If you like a particular manufacturer's sound, it makes sense to stay within the family. The approach of trying to compensate for one perceived weakness by finding a component with the "opposite" characteristic usually does not work, at least not predictaby. I like your approach of upgrading the existing components which you happen to like.
By the way, although I am a tube person, I do like the sound of Ayre gear even though they don't sound remotely like the tube gear I have.