Our printers are frequently pulled apart and the M2 bolt threading into plastic is a clear weak point on this design by Prusa. My solution is a few M2 Nuts. The nuts used were 4mm wide by 1.75mm tall (If you need it to fit a different size let me know and I will make some changes for you).
KennyB did a great job merging the Mk2 and the Mk3 motor mounts and all credit for this should go his way.
When you are slicing you will need to pause the print at 60.20mm to insert the M2 nuts and then resume the print.
Or you can use the attached gcode with a colour change at the right height.
The author remixed this model.
Added M2 Nuts to help hold the end stop switch.