This evening I have mostly been playing with hose.
At the rear I've used a Polo expansion tank and T'd it into the heater matrix hoses:
Up at the front I've just about a figured out the routing of the hoses to the radiator.
I'm pretty happy with the bottom one, but the top still needs a little work, and probably some kind of support bracket somewhere:
damn 4 pics per post rule...