HP Fighting
Ok, don't kill me for bringing this up again, but what about HP Fighting and Psychic for the first set (Sub-CM)?
Psychic keeps your coverage on Zapdos, Swampert, and Rotom-H all the same, and doesn't leave you struggling (as much) against Gyarados and Suicune. HP fighting still...