Intermittent faults can be a b*tch to diagnose, but I reckon you're doing the right thing by starting with the switch.
Having said that, it might be worth having someone sit in the car with the engine running and see if you can replicate the fault by wiggling the oil pressure switch wire about. It doesn't cost anything to try, and you might even save yourself the cost of a switch.