If you haven't already, try and get a test drive in the original car for each lump to see which style of driving you like best as that is a list of VERY different engines.
My choice would be to spend the money on an original G60 Mk2 to avoid all the hard work, or, if cash isn't a problem, the 1.8T due to its tuneability.