This is my plan as well. If we loose the ability to run GrapheneOS, I'll get an iphone and treat it as a locked down home router, and use a linux phone with open source apps for my calls/messaging.

I will also do everything in my power to halt support for Android in favor of web apps. No sense duplicating work for two separate platforms if one is just a crappy clone of another.