I suspect in the next few years that will be less of an issue. There are companies currently ramping up in Japan, Germany and the UK that are making 3D printed solid state batteries that will be lighter, higher capacity, higher C rating than the current batteries. The tech exists, is safety certified but not yet in mass production.