I would get a replacement (aftermarket, or whatever) battery. When a battery either takes ridiculously long or charges really fast, and then dies quickly,...