I have taped and plugged my thermostat housings with npt plugs so if i want to use them again i can jusr pull out the plug and put in a hose barb. I did the same for the throttle body coolant lines. For the water pipe get a nt pipe and crimp and weld the tb coolant line return.
I'll trade you if you want. I like to keep the water lines for the turbo if possible.