I can only speak to F1 (25.5) , what you have will be fine. 25.5 didn't go crazy like 21.5 motors. Besides F1 is all about tires and smooth driving. Low CG shorty packs are recent, can make a big difference for F1. I use the newer SMC and Orion lcg packs, really good bang for buck and in no way slow.