Need some suggestions!! On motor..

[Romster]

I currently run a Lehner 1950 hi-amp 6 turn and a BK 12020 Esc in a 1/8 buggy.
I use A123 13.2volts It's fast enough to hang with most the 1/8 buggy nitro's.
After running everything is just warm. I am geared 18 pinion and 46 spur.
I have a brand new Bk 12020 that I want to put in another buggy. I was looking for a Lehner 1940 motor but can't find one anywhere.
So Basically I need a motor that performs pretty close to my Lehner 1950 6 hi-amp motor.
Any input will be appreciated.