I expanded the bit on Thunder, but I'm saying no to HP Ground. Fire has too much utility as a Steel Killer, and Heatran butchers Magnezone with Fire Blast and Earth Power. You said it bolsters his role as a Steel Killer, but you lose out on OHKOs on Scizor, Forretress (Sturdy notwithstanding), and Ferrothorn.