I had the same problem - took it to the store, and they replaced it.
This only lessened the problem, so I took it back and told them about the swelling battery problem.
They deemed this was the issue, and replaced it at no charge, since I already paid for the initial repair.