Hi Ian, sounds like you are making good progress. Would tend to agree given the number of faults it would suggest the control unit. Not experienced this problem, so other maybe able to give you more confidence as suspect those units are not cheap. Replaced two on an SLK recently, bought used but needed to match up codes to make sure did not need reprogramming and everything work. Again, dont know if the XF has the same type of setup.