Lehner Basic XL 2800 on 24 volts?

I run a Lehner 2800xl in my Ofna 9.5 buggy and it's hot after a run, gonna get a heatsink in addition to the fan it already has because of the heat it makes. I've got it geared 12/51, but think I might go to 14/65 instead which would be a little lower and drop the heat down a little. Problem with the Lehner Basics is the 1/8" shaft, limits the mod1 pinion selection and sometimes makes them fly off.