The colors in the FSM aren't 100% reliable, but they usually are. If the color doesn't match, you'll have to trace the wire to the other end and then match it up to the pinout on the connectors diagram near the end of section 8W in the FSM.
Trying to wrap my head around what you wrote there... Some oil pressure sensors were 2 wire, some were 3 wire, but I think I've only seen the 2 wire on earlier TJ's. The 3 wire gets 5V & ground from the computer, and the 3rd wire is the actual sensor signal fed back to the computer. IDK how the 2 wire works; I don't know that I've seen a diagram for it. The temp sensor is 2 wire 100% of the time, but the only wiring they could have in common is the ground wire.
Do what you can to restore the factory wiring. It will make future troubleshooting much easier.