I've gone down that rabbit hole of swapping tubes. All I got out of it was a pile of expensive tubes I'll more than likely never use and a much, much lighter wallet. The engineers designing amps at Mesa do what they do best.
IMHO you need to just sit down and mess with the amp a little more or...