Did vehicle always have this problem? Is it something new or just discovered? Is vehicle equipped with Headlight Delay Module? Does it have a HD LP DLY fuse?
If your looking for natural wonders, Bay of Fundy in Canada (New Brunswick, Nova Scotia). I must say its a sight to see so much water move in and out of the bay daily.
The only thing I notice, on the Power Distribution page of the 88ElectManual, is each fusible link has both a color and a gauge value posted next to it.
Fuel pressure numbers seem good allowing for a little slop in the gauge. Ideally would be 39psi at KEY ON and 31psi at IDLE. Maybe time for a secondary tune up. Plugs, wires, rotor and distributor cap.
Assuming your not running fan current through the switch, your wiring seems to be correct.
NOTE: Ground coming off of the switch is solely for the Fog Lamp ON indicator. Determine if the 'ON indicator' is the source of the heat by disconnecting the ground circuit on the switch.
You also have a Closed Throttle Switch (CTS) located on the tip of the Idle Speed Control Motor (ISCM). Check this circuit for continuity and no continuity (open or closed circuit) by pushing the tip in and out. Connect ohmmeter between pins D2-7 and D2-13 for this test. KEY OFF.
Do Eagle's tests.
If this was your original setup (old cluster & oil pressure switch) then idiot light should have lit ON with KEY ON, Engine NOT running. Suspect open circuit between new oil pressure sender and gauge in new cluster.
Check out page 75. Show vacuum routing. Should be the same as yours.
http://www.eriejeeppeople.com/Jeep_tech/87_90_fuel_injection_renix/Jeep_Renix_Fuel_Injection_manual.pdf