New motor arrived today, although much smaller than the original the gearbox really helps. Made up a quick adapter plate from some scrap aluminium. Seems much better, will now replace the rear sensor from a micro switch to an optical sensor. This should help as the micro switch was not being reliably triggered.