I'll swap the motor and hopefully get a properly cut one. The misalignment is pretty severe, so filing it down would be a long process, especially with the keyway being awkward to work on and the material being hardened steel (or whatever the shaft is made of).

Regards,
dsc.