NB1 idle drop issue
 

So my 99 is having a idle droop issue when I am cruising, then coming to a stop it drops. clutch in, neutral, clutch out, the rpms will come down normally until the BIS and then drop past to 500ish rpms.
I have set the BIS correctly, with the TEN pin grounded, and when I pull the jumper there is no change in idle speed. I have hooked it up to a smoke machine and checked for vac leaks post MAF. The clutch switch rubber stopper is present. My only other idea is maybe that switch is bad but it springs back like normal. Would that switch cause my issue though or do any of you have a better idea?

Any suggestions?