Make sure you pay attention to the RPM's on the calc as well, important you dont merge past 40K to keep temps in check. The 1518 is better suited for that 6s pack and will make all the speed you'll want. Also, you can try a smaller spur gear ?
I retired from RC, now life is all about guns and long range shooting.