All sounds about right.
The only other thing to try is the gear mesh, if set right you may pick up a little time.
Other than that move to a brushless motor.
The stock motor on mine wore out quite quickly, with a loss of performance to go with it.

adam