Citroen Berlingo engine swap advice.

[Rhythm Thief]

Hi folks, I've got a sick Berlingo on the drive. The 1.6HDI engine is a horrible pile of poo and currently features a knackered turbo, so I was thinking the best way forward would be to fit a bigger and better engine to it. What choices to I have? As far as I understand it the 1.9TD engine from a Peugeot 306 will fit straight in, but I wouldn't be human if I didn't think about fititng a larger engine. I'm not a fabricator and barely know one end of a welding torch from another so anything which requires making engine mounts or cutting the engine bay about is out.Will a GTi6 engine drop in? Will it fit on the existing gearbox? Is there anything else I should know? I know I could simply bolt a new turbo on (and change the oil and filters and pipework six times, clean the sump and all the rest of it) but that feels like much less fun than putting a larger engine in. All advice gratefully received!