I got my car back! Woohoo. Still got issues with the engine cutting out, but the garage couldn't get the diag to communicate with the BeCM, which is weird. Their guess is a wiring fault somewhere between the OBD port and the BeCM. Never rains but it pours. But at least I have a solid 12 months MoT now.