If AE shows RPM your CPS may very well be good since that is where the PCM gets it's signal from. Like mentioned before, throw a spare one in and see if it helps.

Sounds to me more like an oil problem or possibly IPR related. This could be a short or something else.