First thing this morning I re-installed the heater housing to give the Loctite 577 time to go off.
A little while later I re-filled the water system with the coolant (with anti-freeze) that I'd previously saved. I say re-filled, I had a full 2 gallon bucket that wouldn't go back - obviously an air lock. I put the cap back on the radiator and ran it for a while to get coolant circulating, then after loads of gurgling things sorted themselves out and the rest of the coolant went in.
I then re-started the engine and left it running for ten minutes, but to my horror - an oil leak from the same place as before, dripping from the gasket flange between the main body of the heat exchanger and the adaptor that houses the heating element and conveys water from the engine water jacket.

I went through the sequence of bolt removal, re-tightening and replacement with those pesky interfering bolts yet again but to no avail - still oil dripping from the gasket joint.
Now it's a new gasket made from quality oil & water resistant material, smeared in Blue Hylomar, and I had scrupulously cleaned and checked the mating surfaces for truth - it CAN'T be leaking, but it apparently WAS

Accepting that it would all have to come apart again, I went off for a spot of lunch , but lunch was delayed for twenty minutes due to domestic issues, so I went back for one last check with torches, mirrors and clean rags. Sure enough oil seemed to be oozing from the gasket joint. Sitting up to check the time (only twenty mins don't be late !!) a small movement caught my eye - what was that!
On the cylinder head the rocker shaft and tappets are lubricated by a network of nylon pipes, and what had caught my eye was a drip from one of them PRECISELY above the flange where I had an apparent leak. It only dripped about every five minutes but here was the smoking gun - here was my oil leak

Oh the irony, all that faffing about dismantling, making new gaskets, trying to source the unobtainable odd shaped 'O' ring probably wasn't necessary!
Never mind, there HAD been a water leak (that is no more) and there HAD been an oil leak which also is no more !
And while typing this TNT have just delivered the 35" x 39" sheet of 4 mm poly-carbonate which is the last safety shield in the control cabinet so there's a job for the weekend.