I would try a Herbies mat before doing anything. It made a very large difference when I had my MMF 5. It was horrible on my Linn, so it’s not a cure all, but it really works on the Music Hall. I am generally not a fan of tweaks, but this worked very well. Really. As far as an upgrade goes, I’m not sure you can do that much better for $2200.