Thanks Guys
I was planning to sell the MS in the next few months anyway and get an X but this problem has me concerned. But it sounds like if I get a 2018 onwards then I stand a fighting chance.
I still have a year Tesla warranty as it was a CPO car so thankfully this won’t cost me this toke around