Just to round off this little project. Everything back together and road tested. Bulbs were 2 year old Nightbreakers.
Verdict:
Dipped beam has sharper cut-offs, less peripheral scatter and is better against on-coming traffic.
Full beam lights up the whole road nicely - probably don't need any brighter bulbs.
Neither setting was tried in the rain.
Was it worth the time and effort to save £96?
Well, yes and no. Fitting new headlight units gets a massive thumbs up, whether you fit VW or Porsche - do it! [
]
The hassle factor is not for everyone - I had to grind much more off the Golf Mk1 back plates than I originally thought I would have to to get them to fit beneath the 'lid' of the headlight pod. If you reused the Porsche back plates from the old units that would probably be the best compromise (it didn't look as though you could easily undo the plastic fitting without damage though).
For the future though, when Porsche discontinue the part, I would imagine the VW unit will be the only one available.
p.s. I need to investigate the rubber buffer on the rear extension to the headlight and it's role in beam positioning. Mine are missing.