Have you tried actually letting your battery die and charging to 100%? This will recalibrate your battery indicator. I've had the last 1% of a charge last for over an hour while playing a movie on Netflix before. The battery was fine, the indicator was just providing bad information.