Sorted.  Changed the Oil pump today and the gauze was full of crap.  Also changed the switch just in case, but from the state of it the pump was the main cause of the problem.  Also the plastic top of the dipstick has broken and had dropped bits of plastic into the sump.  Not good........
Fingers crossed.......
