I personally think it might be better to change Whirlwind on Skarmory to Stealth Rocks instead, as since you don't always know the matchup against an opposing team, if Heatran gets knocked out before it can set up Stealth Rocks, then using Skarmory as a Defogger and a Stealth Rocks setter can be...