Not sure if this is what you had in mind AAR but I would be up for playing Gabi up front as I think long term a la Thierry that is where he will end up. Don't kid yourself, there will be a short term price to pay as, like Henry did, he needs to improve his finishing and learn the subtleties of the position.
But it is clear that, for whatever reason, we don't play nearly as well when Odegaard and ESR are moved farther back. So:
Back five
Partey Melo/Xhaka
Saka Odegaard ESR
Gabi
for the rest of the year and let's see how it turns out.