Hi Martin
I think you have been wise as the garage will be well practised. Supporting the engine weight on a jack, while the car is on stands, doesn't sound great safety-wise.
There was a lot of gunk and aluminium corrosion in my pump. I cleaned everything as best I could. I have a tiny weep from the rubber hose connection to the pump. The aluminium output tube, which the hose is jubillee clipped to, is quite badly pitted. I may have to do something about it but not sure what (ptfe tape, some kind of sealant or new wider jubille clip, perhaps).
The clanking noise came on quite quickly, over just a few hundred miles. Brands hatch said the bearing(s) were badly shot, when compared to the refurbed unit. The dog coupling was visibly worn, allowing for play and accelerated wear.
Hopefully, the replacement parts will last another 50K miles, although I'd be tempted to change the water pump sooner than that. Not being driven from the cambelt means there is no necessity to inspect it at regular intervals.