Finally, after 6 months of on/off light, got around to changing the oil sensor just above the starter, egged on by copious amounts of info off here.
Didn't have a socket long enough so used a 27mm tube spanner. Removed first go after spending 15 mins. getting the elec socket off! Thought...