The easiest and cheapest thing to try:
Remove headlight, remove the white connector, in which the head light plugs in, from the support. Pull it out and plug it in the head light, and test if all works.
If that solves the issue, just cut of the taps that hold that white connector, see below item 23, in place and plug in to the headlight before push it back in. Make sure to clean the the pins and the plug with some electrical cleaner.
This solved the problem with the headlight and also the turning signal. I had the headlight issue left at first and did as described above, and when I had the turning signal issue, a week ago at the right side I did the same thing at the right side.
Hope this helps.
Cheers
Engelbert