A thought:
CB bulky gyara with intimidate instead of dragonite, that should solve some of your problems, like faster gliscors, switching more to fighting types and it also takes advantage off the opposing rain teams' drizzle.
Idk, this may or may not work.. Because it makes your core weak vs...