That is the D motor and you wont need to change anything. For future refference, the spur is the big gear on the gearbox and the pinion is the little on on the motor. The 64 tooth is the replacement spur for the d box

As for a battery recomendation I am not the one to ask, Im on lithiums. If you do come over to the lite side there are $30 dollar chargers out there