[Engine] Replacing 2.0 Hdi Engine

[Element]

I have an 05 berlingo 2.0 hdi, all was well until recently the head gasket has blown (confirmed by local garage), lots of gases coming through to the expansion tank, overheating, coolant loss etc etc
So I took it to my local garage & asked them to quote me for changing the gasket. They have said that it would be a less expensive option to swap the engine instead of getting to replace the gasket (head would need skimming, possible head cracks, possible new head req'd etc- & I tend to agree. I believe this engine is the 90hp, DW10 RHY version.
However the idea of an engine swap although relatively simple in theory - becomes more difficult when I live in Perthshire & most of the 2nd hand ones from breakers yards are down in middle England & I can't view before buying.. Add to that is the technical complication:
This engine has a Siemens HP pump coupled with a Bosch rail. There is no 'lifter pump' in the fuel tank & the fuel is simply pulled through the fuel filter from the tank by the HP pump. As far as I can see, these siemens pumps are quite rare as most have a Bosch HP pump - which (I believe) and these use a lifter pump in the fuel tank.
Therefore my local garage is recommending finding a "hens tooth" - a used 2.0 HDI with a Siemens HP pump. I am reluctant to scrap the car as I've put in a LOT of replacement parts this last year - including the reconditioned (fixed) rear axle.
Most of the engines I see on Ebay are from 307's or 206's and only 1 or 2 are from Berlingo's - and of those there's no information on what HP pump it has...

So the questions are - can anyone confirm the Bosch HP pump / lifter pump in tank issue - and has anyone swapped an engine over from a different car into a Berlingo with a different HP pump and did you need to put in the lifter pump as well or not?

I'm even considering buying another berlingo and swapping over all the good parts from mine, funds are limited though...