What about gearing? Have you tried gearing a bit lower?
That would reduce the current draw - a 7 turn 1940 must pull a sick ammount of current at the best of times - if it's over geared, i shudder to think lol
Check things are nice and cool - packs, heatsinks etc