If it were only the battery, I'd replace it, but getting a new system will also scratch the itch to upgrade hardware specs. There's also some piece rattling around inside the case which must have broken off early on... (to my point about fragility compared to macbooks)