Sorry guys, replying to my own post, but I think I finally got my battery back to normal after countless hour of experimenting. Here is what I did.
1. Restored the iPhone via iTunes, by clicking on the Restore button (without doing Shift+Restore)
2. Set up the iPhone as New,
3. Deleted my...