Hey Nic, i believe that is the right switch and it sounds like it is the switch thats causing the problem if the fuse is ok, PM pjmspeedy if you want to, he can get parts as well and may be able to help you out.
Hope that helps, also if you have VAGCOM, it maybe worth getting it scanned to see if it brings up any faults.