I had exact same problem last march
Oil pressure would waver and sometimes drop to zero and light would come on and go off again
(This was with new vdo gauge and sender)
I removed the two pressure relief pistons
Polished them with wet and dry and replaced them - problem sorted!!!
2000 miles...