Install a jumper wire across the oil pressure switch located on the side of the motor. A failing switch is a very common occurrence and exhibits symptoms very similar to what you are experiencing. I wish I knew which two pins to jump across, but my memory eludes me. Here is an older post that may give some more detail about what I am talking about.

Mav