I cant be 100% shure but if i remember correctly the tee connetion on the main water pipe goes into one side of the oil cooler (so connect up the two pipes as you said) and the the other side of the oil cooler goes to the inlet manifold.