John,
That's encouraging to hear... I decided to go right to the 21.5/LiPO combo for this class. Good luck, you're treading on some dangerous ground here (even looking at your lap times might be construed as against the spirit of FUN by some) but if you're having fun, you're obviously on the right track...