I've ended up going to the dealers and pretty much getting everything new, other than the jets and pump. It's been a bit of a 'mare.
Seeing as the kit came straight from a GTI I am surprised I'm finding leaks as it should be plug and play on my bumper. I'm changing it to the exact setup shown on the ETKA exploded diagram. (see my original pic - it has the T piece around the centre grille whereas ETKA has this joint coming straight from the drivers side jet with a Y).
The jets have the hose coming straight out, when I trial fitted this was not an issue, but as soon as the bumper went back on it'd make a slight bend in the hose somewhere and thus kink the connector, making it weep. I've got some 90 degree elbows coming to hopefully rectify that.
Also, I ordered the Y joint in place of the T. This is to minimise bending the hose as much as possible.
Yeh I got the two joints to make the S shape
I fudged up though making the hole for the second pump, made it a tad too big and it leaks (I only had a 20mm bit). Have put some silicon around it for now in the hope that works, but no biggie as I was going to get a 5.5l bottle at some point.
MOT on Monday - with these leaks I've just plugged the hole and disconnected the pump to prevent screenwash fluid leaking away.
Thanks for the help.
David