Yup, GrapheneOS on Google Pixel phones has seemed like a temporary strategy that has turned into a permanant one, but ultimately the hardware _also_ needs to be degoogled.
Pine64 and Librem and the two hardware options that seem to be on the right path there, however there is quite a bit of work yet in getting mobile GNU/Linux mobile ready, it's much closer though.