Just an update - Replaced both the cam and the crank sensors. I also left the battery disconnected and trickle charged overnight although the charger did say the battery was good and I doubt the battery was the problem.

I plugged the battery in this morning, and holy mother of car alarms! Closing all the doors and the hood, then hitting lock and unlock on the key fob a bunch of times stopped that. The car then wouldn't run at all, after some head scratching and swearing I opened the hood and realized In the hurry I didn't plug in the crank sensor... oops.

Car is running great now after a two month hiatus, I wish I replaced the sensors separately so I knew which it was but my gut is saying cam, since it did start just not run great at first. Hopefully this helps someone else who has the same problem.