Given ongoing industry big-bucks R&D, automakers (both EV and ICE) will continue advancing auto safety. Two decades ago, almost all auto industry "experts" claimed EVs will never catch on and are a total waste of time. Tesla proved them all wrong.
Suddenly, most automakers today are finally starting to at least talk about EVs and some are even starting to produce them. Of course, Tesla's already been making EVs for two decades, and Musk regularly launches U.S. astronauts into space in his SpaceX rockets, on behalf of NASA and the U.S. government. So, Musk probably has a decent clue what's needed over time to substantially reduce the risk you mentioned.
Gw,
Just over a year ago..
Tesla big battery fire in Victoria under control after burning more than three days
A large blaze at Victoria’s “big battery” project has been brought under control by firefighters after burning for more than three days, allowing investigators to begin examining the site.
A Tesla battery bank caught fire while it was being set up in Moorabool on Friday morning, and then spread to a second battery.
Back to the drawing board..