If using a 5 cell NIMH, switch to a 4 cell 2000mah pack instead. Sounds like the ignition to me too.  When the engine quits, and you cant get it started, is there fuel on the plug? That would be a good indicator of the ignition.