How's things.

If it was me I would scrap the 1.9 and do a m52tu/m54 swap but it's not mine

Best bet is to strip it down and do the HG and C system. No point going at a second hand 1.9 engine. Make more sense to repair what you got.