Quick update
Taking my X back to dealer on Monday as they won't admit it but will review and reset my settings again.
I'll find out by end of day if they were wrong or if it really is the dreaded EHC module