neutral switch can confuse the ecu, i had a long list of problems with my car, after replacing maf, some of them became less or went away.
i would start with the cheap and doable stuff like adjusting tps, ignition, idle etc. you will need to adjust ignition and idle again after replacing important parts like the icv.
typically engine rpm can rev up and down a couple of times, my experience after a long drive then the last mile with the 35 speed limit i press clutch and whoomm, whoom,whoom. that for sure has to do with the neutral switch and they tend to break down.
but it's true, it can be dirty however cleaning the aac might a be a good idea, the iacv is less likely to go dirty. i swapped mine for one from a scrap car and it idled just a very tiny little bit better
getting datascan and or hooking up your car to the nissan computer mught also be the cheapest and fastest way to find out what is going on. you are not obliged to let nissan repair your car, u can ask for a diagnose
ps, no thats not a good idea without aicv it wont start (i didnt plug the tubing) and aicv it will need badly especially the 2 liter, thats because it needs proper idle and ignition timing and japanese wizardry