Ok, so after 3 weeks, I have my bike back & working.
I managed to agree with CRC that I'd drop it into my local Shimano dealer, who would carry out the diagnostic work & send to Madison (£39, being reimbursed buy CRC).
Madison had the motor for almost 10 days before even looking at it...