My timing belt went on my 03 GTS so I had to have the heads reworked and all that. Changed the water pump while I was at it. Take it from me, get FACTORY OEM O-rings. They are $7 at the dealership but anything else will leak! Also replace the two small heater hose ones. They are $5 at the dealership, I think. Use petroleum jelly to lubricate the O-rings and be very careful when stabbing that pipe into the water pump (assuming the water pump stays in the car while you take off the dizzy and T-housing). Then leave the bolt holding the water pipe to the head (via the bracket) LOOSE while stabbing the T-housing back on. Be VERY careful because it is VERY easy to pinch that O-ring. Make sure the O-ring seats and the flanges on the T-housing mate up flush to the heads (NOTE: recommend new gaskets there and ensuring clean surfaces. I've made paper gaskets though that work well, but stick to the surfaces if you have to take the T-housing back off). You MUST stop trying to stab stuff in anywhere if it puts up too much resistance. Resistance=pinching, but it shouldn't be too easy. If it's too easy your O-rings are too small and you will be back at square one. Once your T-housing is TORQUED back down, use a 12mm wrench to tighten that little bolt securing the water pipe to the head. Be very careful with the heater hose O-rings as well. Those things will piss coolant like mad if they aren't just right.
re-installing the T-housing is a delicate thing. To do this right, I had to put my nose right down on there so I could see the water pipe stab properly into the housing. The bolt is left loose so you can reach under and wiggle the pipe to line it up.
Other notes: try to be careful of the O-ring on the water pump side of the pipe when pushing it through the valley under the intake. you don't want any debris on it and don't want to damage it either. When I got it right, I was 100% sure it was right. Lube up the dizzy O-ring with fresh oil. Use brake parts cleaner or carb cleaner to clean the areas after installation so ease in diagnosing new leaks. If you get the T-housing back on and have to tighten the four bolts to get it to fluch up to the head, your O-ring is out of whack. The housing flanges should at least be really close to the heads and only require a couple turns of the bolts to get them to flush up.
I've made every mistake in the book on this one. Too small O-rings, not lubricating, tightening the 12 mm bolt and misaligning components. I even left out the bolt on the heater hose brackets that secures them to the lift/plenum support bracket. Sorry about the long post.