Getting the cheap battery/charger combo off eBay sounds like a great stop-gap measure. While that works you back up all your necessary data. When you are certain you have your backups in order, ship the poor dear away to be fixed.

Now I'm getting more and more nervous about my charging port. Maybe I should send away for a battery and charger now!