At least the battery problem will be solved in the EU, where it’ll be soon (~3-4 years) mandatory to have a replaceable battery in consumer electronics (as reported in European Parliament to upheave batteries lifecycle practices)
As for the screen, I think the issue is a bit hairier than that… but who knows, maybe the industry can begin thinking in donut economics by 2030 