Wouldn't a better solution be to just make sure dangerous batteries don't get sold? Just regulate them for safety like tons of other dangerous goods already are
After the first recall, when a few of the replacement phones caught fire again, Samsung couldn't even reproduce the issue in a lab. Regulation isn't going to prevent bad things from ever happening. You need a fallback plan.