For the water leak, it's just a O-ring seal, have you checked the base timing?

here's a good pix of the water pipe that bolt and one on the back on the drivers side gets it off... bolts are a PITA to get at though.