The 540 should be fine with the esc, i used to run a 540 sport motor in my springer with a 27 turn ( 25amp) esc with no issues. however the run time will be seriously reduced to around 15-20 mins using the 7.2v 1700 pack, i would look to change the motor, perhaps water cool it if its hot, or fit a larger 480 size, as this will keep the run time up around the 45- 60 mins. The heats being generated by the load of the prop so maybe look to change it to a smaller prop 2 or 3 blades, other wise i think the new motor will have the same results, a bit of trial and error between the motor and prop i think.