Hi again, Well yes..according to BoneyBradley there's two switches..it would seem that the one for above 2000rpm may be the culprit..at least that's the obvious thing to do next, replace the switch.
If it was me i'd be down to my VW dealer, give them the details, your car REG will let them identify the right parts for you..
Christo