Not OP but I switched to a FairPhone 3 as soon as it came out after my Samsung experiences. Also wanted MicroSD and Dual-SIM, replacable batteries, easy to fix, longtime support.
Still loving it ❤ FairPhone️ 3.
Back then it shipped with Android 9 and recently got Android 13. That’s support.