i'm about to do this as well. for the water outlet of the turbo, i would have guessed to tap into the hose which goes from the water outlet on the back of the head (next to firewall) to the thermostat. for the feed i would have guessed to tap into the hose from the water pump?
not entirely sure how your setup is at the moment, but mine has no heater hoses attached.