If you had Bronzong or Milotic counter Gyarados it might work better than Jirachi since it's weak to EQ.
If you add Psychic to Bronzong and HP Electric you could take AA off Gliscor for Ice Fang.
I'm iffy about Metal Sound on Heatran, doesn't seem fast enough to abuse it. But I don't really...