Finally got round to this the other day. Flashed the byd image of oneui6 and then the dyd9 version of oneui7 using the home_csc both times and it got me up to the correct version. Google pay was still winging but after reinstalling pay services it was happy though I had to re-add my cards.
