The easiest way to fix the hot chassis problem is to rewire the switch so it goes to the power supply instead of ground. I did an article on my website on the various ways to do it. The key is where the switch is wired. If one of the prongs on the cord goes straight to ground, polarize that prong. Then, pray your outlets are wired properly. Your print will tell you which modification you will need to do. It's not historically correct, but your set will be safe and it'll keep your isolation transformer freed up.
www.geocities.com/evilfurnaceman