If not much harder a swap I'd say the newer 1.8t's would definately be a better engine. If you have the mechanical skills though and don't mind some hard work fire an H22a in there, for the money you can't get a much better engine. My old one produced a proved 229bhp and was brutally quick for an n/a with not much less torque than a VR6 (and peak torque coming in at 4.5k rpm)