What if you went to 20S using one of these
That should get you to 32km/h (19.8mph) on the same motor.