The only thing I couldn't work out with your op amp schematic, is where the power for the motor comes from as it shows the supply connected across the motor

Smoothing capacitors across the output helps with the harshness of the PWM, and I'll try using a diode in parallel with the motor, but won't that effectively short the output to gnd ?