I would recommend putting Heatran over Tyranitar, it helps against your problem Pokémon (special defensive Breloom, Infernape, Gyarados, Kingdra) while also being a much-needed Jirachi counter (what with Hippowdon being unable to counter it and all).