The neutral switch does sound like the first place to check with oil present and it's not coming from the filter. Somebody else had one crap out a couple of years ago and posted about it, I seem to remember.