I've always said if there is a factory made version of a car buy it rather then do it yourself. I'd go and get a G60 and sell the 16v. Lot less hassle and more chance of getting known history of the engine with a complete car.
The key with G60's is history, they can be reliable if looked after.
A 1.8T swap is good but not cheap