It seems my problem has fixed itself. I didn't change anything but just let it drain 2 or 3 times already and then charge it fully overnight. I am SO relieved the problem is gone.
Glad to hear that buddy
However, after reading your story, I'm still afraid to update to 4.1 and am running 4.0.2