Rx8 Idle Hunting Issue

Hi, my 2005 Rx-8 has a weird idling issue where the idle surges when the clutch is depressed but when engaged, the idle jump up to about 1500-2000rpms and surges up and down. I've done some research and found that it is most likely a problem with the neutral switch or clutch switch and is a common problem on Rx-8. I have recently bought a new clutch pedal position switch and installed it today and the same idling problem continued when the clutch is let off. I finally just disconnected the clutch pedal position switch and found that it fixed the idling issue and the car runs fine without it. Should I reinstall and buy a new neutral switch or just keep the clutch pedal position switch disconnected? Any help and opinions would be appreciated.