You need to change 2 pokes then, perhaps Gliscor > Slowbro (both wall physical attackers like Fighting types) and Gastrodon > Celebi (they both take Water attacks, and with a +1 boost Gastrodon hits pretty hard as well, Gastrodon can't take status like Celebi could with Natural Cure, but Toxic Orb Gliscor does).