Thinking about ditching GrapheneOS to get better hardware

Why not try Calyx and see how you like it. Its a little more convenient than graphene and has micro g installed so that you get push notifications from apps. That with Aurora and fdroid would give you access to most any app that you would need.