Making the batteries easily swappable could be a way to address both the charging and safety issues: should a battery catch fire while the plane is in the air, the pilots could have the option of jettisoning the affected battery bank, worst case converting the plane into a glider.