I would recommend two things:
1. Check the oil pressure at the port used by the idiot light with a mechanical gauge. Make sure you have the engine fully up to temp. The oil pressure will keep dropping for likely around 20 minutes as the engine oil reaches full temp and stabilizes.
2. Assuming this comes back with a hot idle pressure reading of under 10 psi...... cut the oil filter and inspect.
I have not seen any significant failure rate with the idiot light switches - I've seen a couple leak but that's it. They are a rock solid part and I have especially not seen one react exactly the way you would expect it to react under a low oil pressure condition without that condition actually being reality.
Further I have never seen a situation on any engine where replacing the oil pump fixed the low oil pressure condition. And applying science and logic to how pumps work makes it pretty obvious why that is the case. The pump isn't the source of the "pressure" that the switch is reading. Bearing clearance is the source of the pressure - or rather the lack of excessive bearing clearance.
I've been doing this a LONG time. Back when my EA81 in my off-road lifted wagon had the flickering oil idiot light at idle..... I was about 20 years old (man - has it been 22 years? crap) and didn't recognize the symptoms. I resealed the oil pump and that indeed brough the pressure up just enough to kill the light. About 2,000 miles later it threw a rod on the freeway.
IMHO - you have about a 1% chance it's something to do with the idiot light switch, and about a 99% chance that engine is going away internally.
GD