Another CRT.5 ESC/Motor question...

[GO-RIDE.com]

I currently have a CRT.5 that is set up as follows:
ESC: Novak GTB
Motor: Novak Velociti 6.5 (5900kv)
Batts: Lipo 4800 2S
Spur/Pinion: 46/12 or 13
Tires: 2.2 Truck (about 3.8” dia.)

It runs really well on my local indoor track and is pretty fast down the back straight. At this time I’m ready to get a dedicated system and batts for this car. I’d like to maintain my estimated top speed of 35 - 40mph, but gain some punch for jumps out of tight corners.

I’m going to buy the maxamps batteries that fit this chassis (100mm L x 34mm W). I’m deciding between these two options:
1. Stay with the GTB/6.5 and get the maxamps 4200 2S batts. This will be the same performance accept for the car being a bit lighter.
2. Purchase a Mamba Max ESC, Feigao L motor, and Maxamps 3100 3S batts.

If I decided on the MM / Feigao L / 3S combo which motor would best suit the CRT.5, and would it have considerable more punch than the Novak 6.5?

Thanks for the help.