I recently did a health and safety presentation on batteries. Their energy densities are starting to get pretty high and sometimes they can catch fire even while in your pants pockets.
The new developments to make them even more powerful might not be a good thing if you think about it.
Yes, I think we should move from making more powerful batteries to making batteries we can charge in seconds or few minutes.