Haha, yeah compared to VAGs of that era, the MK5's shift is like a Honda S2000's......well, it isn't really, nothing is that good, but you know what I mean

I think my hatred of VW manuals is compounded by the stupid Helix clutch needing the pedal to be right down otherwise the gears baulk. I need to look into that as it's getting annoying. There's a lot of conflicting info about it.
Anyway, if your shift is decent, I would try the S3 one with some bushes first!