The S3 engine will fit your GTI, my mate recently done the conversion on his manual GTI with no issues. Just make sure you get a S3 DSG engine with proof of mileage and also have it checked out by a mechanic as you don't want another engine with problems.