No more oil leak! Choke light goofy, though. Sender replacement?

[KShortell]

Woo hoo! I solved my significant oil leak.

I sat under the truck a couple of weeks ago with the engine running. I could see the oil dripping out of the mating surface between the oil filter adapter (for the factory oil cooler) and the block. I put on new GM oil cooler lines and a GM gasket/seal set for the adapter. No more leak! The only hang-up was that one of the OEM oil cooler lines is a bit short. We'll see how that holds up. I was disappointed, though, especially since they cost so much.

Of course, now my lazy oil pressure switch has gotten lazier. The choke light comes on more than it ever used to. It came on a lot yesterday, the first day I've done any towing in months. It gets worse when warm. My oil pressure gauge shows OK oil pressure, though. It's getting annoying and I'm looking at just replacing the switch.

Does anyone know which of the two senders on the top back of the block (next to the dizzy) is which? I suppose I could just follow the wires. Also, the FSM calls for a temp sender socket. Is there really a special tool needed or can I use something else?

I only ask up front before I tear half of the stuff off the top of the block that's in the way in order to get to it. Thanks!