You could change the garage you are using.. My experience with main dealers is they have a lot of problems fixing faults in my brand new cars. Then i discovered Volvo and the two cars i have had, do not get faults to fix.
My boy in the garage reckons Honda cars have the least repairs or faults. VW s have the most repairs and faults especially diesel Golfs.
Time to sell it to an unsuspecting dealer David.