I'm having odd battery issues recently too: It's not as bad as yours, but as of a few days ago, it will not show itself as being done charging - it just keeps blinking yellow, on-off, on-off. Conky will report 100% battery after I unplug it after a night of charging, so I know it's just not stopping the charge and trying to over-charge the battery... Which is slightly annoying. At any rate, if Icould help you, I would.

At this stage, if your problem is making this unusable for you, I'd just reflash. For me the process was reasonably painless.

Though if you can afford to, I'd wait a bit to see if anyone else more experienced pipes up with helpful information.