Z3 headlights not staying on

Hello there, first post here, please be gentle!

I'm driving a 1.9L, 1997 right hand drive Z3, and I've got a few issues with the car but I'll start with the problem that has just appeared, which I figure is the most serious of the lot...

My headlights do not stay on, or sometimes do not even come on at all, I've noticed this in the last week or so. My fogs, side lights and high-beams all work, it's just the main lights that are having trouble. I figure this problem is due to 1 of 2 issues, a wiring problem at the light switch or a faulty headlight solenoid / relay (if such a thing exists).

Have any of you come across this problem before?

Given the fact that the days are short where I live and we currently have snow & bad weather I want to be able to see where I'm going and I also want people to be able to see me.


Thanks in advance,

Frank.