JT
That is what I would do.
Watch for excessive temps when running. If after 2-3 mins of running fairly hard you can't hold your finger on the motor, run a smaller pinion or larger spur.
I would also check all the rotating parts for dirt, grit or any problems. Dirt , grit or binding in the trans or outdrive bearings can cause unnecessary drag increasing the load on the motor, ESC and battery.
Excessive load = heat.
One small drop of oil on both of the motor's bearings will be enough. Re-oil after any thorough motor cleaning. Too much oil attracts dirt and debris.
The RC10 tuning tips on Associated''s site are a good reference point.
https://img2.associatedelectrics.com/pdf/cars_and_trucks/RC10_Classic/RC10_Classic_Kit/manual_RC10Classic_2013.pdf
Don't forget to add the radio interference caps.
Chuck