Well 1 year, 6 months, 16 days after posting I finally decided to get round to sorting this, it was the bulbs. It was a bit of a faff, but simple to fix. I ended up taking the clocks off for better access, thanks for the pointers everyone.

I'm so glad I'm not the only one that just keeps on riding things with stuff that needs sorting..might look at why my clutch drags a bit sometime soon...or may just ride it around Europe again like it..