That's really helpful, cheers.

Do you know if the scratching sound from the oil gauge on startup/switch off is normal?

Also, when I went out in it tonight, the dash initially didn't light up when I turned the headlights on, but after turning them off then on again, it worked OK; does this sound like the headlight switch/brightness adjuster to you?

I guess for the low price of these parts I could buy both and try them one at a time to see it solves it....