gearing for NEU/MMM in E-Revo

[JThiessen]

Just got my new Neu 1515 2.5D today, and of course I'm anxious to get it installed and running with the MMM. But given the MMM's issues, I want to make sure that I dont under gear it, especially since I dont have a lot of battery.
I ran the speed calculator to see what gearing to use, and I'm not sure which direction I should go with it.
My stuff:
Revo, Gmaxx single speed tranny, pro line bad lands MT's, and currently running 4S A123's (I know, that's a little low for that motor - but I've got growing room, right?). All of my gears are .8 mod (32P), and I've got 12T-18T pinions, and 64 - 72 spurs.

Heres what the calculator told me for a 64tooth spur:
Differential Ratio: 2.8461538461538462
Transmission Ratio: 1.7222222222222223
Additional Ratio: 1
Spur Tooth Count: 64
Pinion Tooth Count: 15
Battery Voltage: 13.2
Motor KV: 1650
Tire Diameter (inches): 5.84
Top Speed (MPH): 18.0934 MPH

So I know I have to change something significant. As far as I know, I cant get a 33T 5MM pinion, so I either have to up my voltage significantly, or go to a different gearing solution. I'd really like to stay at 4S on my batt's since my other trucks are set up with Novak HV's, which are limited to 4S. SO that leaves with changing the gearing. It looks like I need to go to Mod1. I was already looking at changing my slipper to the Revo Spec setup (Linc reminded me about that yesterday in one of his other threads), so as far as I can tell, putting a Revo mod1 spur on the Emaxx tranny should be easy, right? Now if anyone has done this, is there any clearance issues due to the dia of the gears that I should know about? I have a 15T Mod 1, so if I got a 36T revo spur, here are the numbers:

Differential Ratio: 2.8461538461538462
Transmission Ratio: 1.7222222222222223
Other Ratio: 1
Spur Tooth Count: 36
Pinion Tooth Count: 15
Total Voltage: 13.2
Motor KV: 1650
Tire Diameter (inches): 5.84
Tire Ballooning (inches): .5
Motor Current Draw: 0
Motor coil Ω: 0.01
Spur/Pinion Ratio: 2.4 : 1
Total Ratio: 11.7641 : 1
Tire Circumference (inches): 21.49 inches (545.81 mm)
Total Motor Speed: 21780 RPM
Vehicle Speed: 37.67 mph (60.52 km/h)
Estimated Adjusted Speed: 36 mph (58 km/h) - 5% loss
Effective KV Value: 1650
KT constant: 0.82 oz-in/A
Motor Torque: Amperage not specified...
Final Torque: Amperage not specified...
Final Power: Amperage not specified...

Does that seem doable with the Neu and MMM, without putting anything at risk heat wise?