You, sir, are a genius in team building. Maybe it helps that you've run something similar before, haha.
I used to have water pledge on Greninja, but I was finding that Venusaur usually gets KO'd before Charizard, and then I didn't really want to use fire + water for the reasons you described...