One important thing to remember is the that battery capacity is unlikely to improve anymore, we should mostly improve charging, lifespan, safety, etc.
I doubt that we will ever see batteries that have much more capacity per weight than what we have now.
Linux
Looming In Networks Until eXtinction