What you are describing, almost to a T, is Purism's Librem 5 - https://puri.sm/products/librem-5/.

Also I would look in to Pine64's PinePhone (Pro), or even Fairphone.