The sensor below the starter is a oil warning switch, the oil pressure sending unit is mounted right above the oil filter, and they tend to act funny before they go out. I have one if you want it, think I gave $10 for it (cost over $30 new), send me $10 and I'll ship it to ya. PM me if you'd like....
BTW, the switch with the broken wire you speak of is $11.99 at AutoZone, I just replaced mine. Thought that would help <img src="/forums/images/graemlins/rolleyes.gif" alt="" />
Later,
Nick