Have you tried better tubes?
It is doubtful the stock tubes are anything but the least expensive tubes Mac could source..
I would try a set of Genelex Gold Lions for new production or maybe a matched & balanced set of NOS Mullards..
I also wonder are the Acoustics of your listening room treated to allow imaging & staging to bloom as it should instead of being cancelled out by reflections & reverb?
