I had finally fixed my battery issue by tricks from this board. Thanks all.
The problem now is I ordered the slide in holster, and left it in over night on my night stand, the battery went from 90% to 45% overnight. I thought the holster was supposed to give better battery life, not worse, what gives?
P.S. I searched but couldn't really find any problems with the holsters...