That one I linked on ebay is the correct one for you then.

The console will need to come out as the shifter is larger than the hole in the console.

I have a guide for removing and fitting consoles in my links (under my posts when viewed on a PC).

It's quite late so I may have missed something.

When I bought my mk2.5 recently it had the same issue, which I somehow missed on the test drive. It wouldn't flick back to centre to change from 2nd to 3rd.

I pulled up my gaiter and looked at what parts moved it sideways. Oiled these parts and worked it in by changing gears. No problems since.

Easier than ripping everything out.

The problem for Mark is that the shifter spring on His car is shrouded inside a box assembly and reasonably inaccessible.

A shot of fine grease may be worth a try but no guarantee of success.

It certainly wouldn't be prudent to use something like WD40 or similar as this would remove more grease and amy grease that was too thick would gum up the works more.

Something like PTFE grease used on bicycle chains/gears would probably be the best to use as it's not too thick or sticky.