If it's doing while you are under load (driving down the highway), I doubt the clutch switch is causing your problems. When it fails, it won't make contact telling the computer that the clutch has been depressed (disengaged). So if you are in gear driving down the highway, it shouldn't make a difference. But, I would definitely get it replaced. It should only be $10 or $15 are you local dealer.
As for the sputtering...
Does it stop doing it above 2000 RPM?
Does it do it when accelerating? Steady Cruise? During Deceleration?
Does it do it when you are parked and rev the engine to that range?
Is there much difference in sputter in 1st gear at 1800-2000 RPMs versus being in 4th or 5th Gear at 1800-2000 RPMs.
Have you checked the terminals on the MAF connecter. They are notorious for getting corrosion....