NIMH should be a drop in, 3s LIPO, umm, does the old ESC handle them? That old ESC may not have the voltage cut off a lipo would need. If it is a BL motor, a new ESC and lipo would be cheap enough.

Buzz.