Great ideas! Confirm what the battery voltage is before you pull anything out of the motor. I would even charge the battery to different levels (max, 90% charge, 80% charge) and see what point it stops being a problem. Also note, that the stock firmware will create a strange lack of power when...