Just wanted to followup on my post. I ended up reloading the OS from scratch, and battery life seems good again.

At some point I installed an SD card and enabled virtual memory on it. I had since pulled the card out, but don't believe I ever disabled the virtual memory setting.

Wonder if that could have been the cause?