>So what would your straightforward "fix" look like?

A repairable powerful phone with replaceable battery and pathways to minor upgradability that you can trust not to fuck you over long-term. I.E. the closest equivalent of Framework to smartphones.