I hate to be the one that throws a wrench into the running engine, however here goes...

When making changes to the original 'design' or selected components, like for instance, changing from LiPo to NiMh, or increasing the size of the motor, remember to include the weight of the new components in your original calculations to determine the weight to power ratio.

CGr.