I'm going against the grain here, but what's the point of a 2l bottom end conversion?
Right now, your car is between 23 and 35 years old. It's probably not as sprightly as it used to be, for sure.
Changing the bottom end is a lot of hassle for what it really needs, which is something along the lines of having the engine bored and rebuilt. The injectors are probably screwed as well, and they need replacing (they actually have a shelf life).
Working on its real problems will gain you much more in performance than messing around with the bottom end, which merely increases torque. Torque is useful for my pickup truck, and even more useful for when I'm pulling an excavator.
Your Golf however weighs about a ton and does not pull an excavator. So bhp is more important than lbs torque.