On that calculator, assuming you are right, when you go to 6s power and 25t pinion it should be 62mph (claimed top speed) which it isn't (it's 58) so I would suggest something is out.
My Revo BL on 4s is calculated as 33mph right now and it's not even close in speed to a Flux on 4s