One thing that I forsee helping in the future is having 18650/21700 batteries be interchangeable like normal AA batteries are.
If devices had sufficiently smart BMS modules then we could stick any batteries into them without any added fire risk and they could simply alert us when one was bad and needed to be replaced. Also with regards to fire risk there are mitigations that should be standard (like what tesla does).
If there were no "batteries included" and they were easy to add it would cut the cost and the e-waste by a ton.