New Highest TrueDPS per Type

Hello Pokemon Go Trainers,

Some time ago after the CP changes I made an excel sheet to calculate highest DPS per type as we didn't have the ranking set here yet.
Now I can compare with the new ranking available at Highest DPS Per Type Tab and some results are different.
I wonder if someone could check my math to see if I took a wrong turn at some point.
If you don't like math talk, please stop here as it can get boring for you from here on.

To calculate DPS of a move, first I use the formula rounddown(0,5power(atk/def)*stab)+1 than I multiply (1000/cooldown). For neat results, I assume def = 190 (top tier defenders Lapras and Snorlax).
To combine fast and charged moves I use an if formula to test if charged move dps is higher than fast move dps. If not, the result is simply fast move dps. The other case is where all the fun is.
To calculate a combined fast and charged move dps, first I need the amount of times a fast move needs to be used to charge the bar enough to allow a charged attack. So, thinking of that, I used a formula that looks like ((fast atk damage per use * taps to fill the bar just enough to release its specific charged atk) + charged atk damage per use) * (1000 / ((fast atk cooldown * taps) + charged atk cooldown)).

So, what can you guys tell me about that?

My sheet tells me that Venusaur has the best DPS for grass type with Vine Whip and Solar Beam, Tangela comes second with the same moves and Victreebel third with Razor Leaf and Solar Beam.
And the best DPS for bugs is with Scyther with Fury Cutter and Bug Buzz. Pinsir is the second best with Fury Cutter and X-Scissor.

Thanks for your time and patience to read all these and sorry if someone got bored.

Let's keep on training!