540C motors, always hot?

As a temporary solution, do you think a 13T pinion, instead of the 15T would help at all?

I was also thinking of using a 550 motor instead for longer track times, still at 9.6v.