I had the same 4k rev issue and it was the wax idle unit too. If your issue comes back take it out and clean the coolant passage. Probably no...
+1. Based on that diagram above and the fact it doesn't die when you put it in gear, it looks like clutch switch is the most likely candidate.
Separate names with a comma.
