THIS WAS MY FIRST POST WITH SIMILAR PROBLEMS
The garage finally ended up fitting both lights and wiper stalks, in fact replacing the whole unit.
Although not thoroughly convinced at this stage that this will solve the problem I am prepared to give it a go.
I EXCHANGED THE CAR, SO I CANNOT KNOW IF IT SOLVED THE PROBLEM.
I WOULD ADVISE THAT YOU CONTACT YOUR DEALERSHIP.