RJC Racing has a shim kit for the cam lower section if you have play in it up-down, if cap is not craked or has any rubbing marks i wouldn't replace but if ya feel the need get the casper electronis cap with led light for ease of installation if ya ever take it out.
Take the cap off, and check that the center screw is tight. Just went thru the same thing; I thought it was the sensor, and it turned out to be the screw had loosened, letting the ring move back and forth.
Sounds like a cam sensor issue to me. The only way to know for sure is to check the cmp reference signal with a lab scope. If you want to wait till the July 4th weekend, I'll check for ya while I'm in your neighborhood on vacation ha ha ha!!! By the way, how are things out there? I'd love to move back!!