This seems like the only sensible long-term solution to me unless anyone else has an alternative. AOSP public access is already on the chopping block, custom ROMs are the short term solution but still operate at Google's whim under the hood.