for the water you should be able to switch sensors, yours should have 3 or 4 though, 1 or 2 for the ac, 1 for the gauge, and one for the glow plugs
there could be some water sensors on the back of the head above the transmission maybe one on the front and one on the back, it's all diferent. haha i know what stage you're at now though, it was pita for me to switch all the accessories when i did my swap