While you're replacing the switch, look at the wire for the oil pressure switch, not uncommon to have the insulation crack and come off .
Heat shrink on the wire will work, without replacing the wire .
Take a look at the transmission neutral switch also, the wires here, do the same thing .