The battery in question was the extended battery - I guess IS the extended battery.
Anyways, I broke down and did a master reset.
AMAZING difference - in the time I had the Q connected to my PC to re-sync all my contacts & calendar entries, it took more juice than it has in the past few days in the same amount of time. In fact, it's been charging REALLY slowly lately until now.
So, I fixed it the hard way - but it's definitely worth it.
Thanks for those who contributed!
