Why not straight to Android 16 then?
Also: Use LineageOS and not regular AOSP as your upstream. Maintain hardware adaptions there and then branch off your release version with necessary adaptions for Google certification from this. Less maintenance burden, quicker releases, literally everyone involved wins.