It is normal for the motor to spark. They should be fairly small though. If your getting large sparks, somethings wrong.
As you have reverse already, I don't think that a shotke diode will help you out any. A capacitor won't hurt any though. Check out the Novak one. Simple to put it on to anything.