Garage have managed to find both modules in the used market here. Pretty shocked to be honest. Its a gamble but im going to give them the go ahead to swap them out with the understanding they can be returned if they dont solve the problem.
Well i have the car back and have driven it 30 odd kms and they also test drove it. No issues. Seems to be fixed. I count myself incredibly lucky.
Car goes up for sale tomorrow.