RE: Need info on a replacement motor
If the motor and esc were cool (and you were probably maxxing it out a lot since you say it is "slow or underpowered") then perhaps a apc 9x6 would be nice for the stock stuff. I'm going to do a calc and post since I need the practise.
It looks like it is pulling too much current , but putting a watt-meter on it may tell otherwise. I'm guessing that even with an average battery it will be less than 30 amps on the ground.