Only 12 Pokémons off, not bad.
I would’ve done
Gym1: Hoothoot, Pidgeotto
Gym2: Scyther, Ledyba, Spinarak
Gym3, Clefairy, Miltank, Snubull
Gym4: Misdreavus, Haunter, Haunter, Gengar
Gym5: Primape, Poliwrath, Heracross
Gym6: Skarmory, Magneton, Steelix
Gym7: Sneasel/Weavile, Dewgong, Piloswine/Mamoswine
Gym8: Gyarados, Dragonair, Ampharos, Kingdra
E4(1): Xatu, Espeon, Slowking, Jynx, Girafarig
E4(2): Qwilfish, Venomoth, Muk, Forretress, Crobat
E4(3): Hitmontop, Hitmonlee, Hitmonchan, Steelix, Machamp
E4(4): Umbreon, Vileplume, Gengar, Murkrow/Honchrow, Houndoom
Champ: Charizard, Gyarados, Tyranitar, Dragonite, Dragonite, Dragonite