Pinephone, Librem 5, Fairphone. The first two aim at being secure and trustworthy, at the price of losing Android, which is not a big issue for many users. The latter aims at sustainability, has removable battery and is modular, expandable and repairable, but runs Android with all its drawbacks. There are options however to purchase it (along with other "normal" models) with /e/OS preinstalled which is a De-Googled Open Source version of Android.

https://www.pine64.org/pinephone/

https://puri.sm/products/librem-5/

https://www.fairphone.com/en/

https://esolutions.shop/

edit: Both PinePhone and Librem 5 also have a replaceable battery and can be repaired to some extent. There are also spare PinePhone mainboards and other spare parts for sale at Pine64 site.

https://pine64.com/product-category/smartphone-spare-parts/?...

Haven't had these issues with the one plus 3t, so one plus it is for me