From memory the EFI water temp sensor is at the front and top of the engine near the top coil. Right hand bank. Would be under the plastic bits. I think it's mounted to the water bridge that joins the two heads together.
Here's a pic you can see both sensors there. The EFI one(two wire connector) and the dash gauge one(single terminal).
The air temp sensor is built into the AFM. Pins 1 and 2 on the AFM connector.