I think on your first point there is something in the works: https://puri.sm/shop/librem-5/ -- if you don't, unlike me, use your phone for lots of things (like banking, work apps) that won't be developed for this platform, it might be an interesting option.