my clutch was on its way out with the same symptoms except mine was notchy in 1st and reverse with no slipping or smells untill one day it just went.I tried adjusting the gear linkage to no avail but also noticed the gear linkage bush was warn witch cant help so i changed that too.
How did you change gear linkage bush and where is it on the mk4 my gear knob moves around a lot like its loose selects gears fine tho so i wana change the bush see that sorts movement