After reading up a bit, I went ahead and ordered a 24T hardened rc monster pinion for my Emaxx, and also will be picking up a variety of Emaxx specific spurs 62 and 65 (stock is 68) to use with my 1512 2.5D 14.8V setup.
I hope to have my pinion in this saturday from RC Monster.
Just need to convert everything back to 2 speed now.