Does it roll smoothly to a stop without the pinion meshed to the spur? I'd check that out.
You should be fine to just swap over the spur gear, jusr need to get one the same size & with the same mounting pattern- maybe brand specific, not certain on that.