I'd try a 343:
------------Ferran-----------Jesus-------------Bernardo--------
Mendy------------Gundogan-----------KdB----------------Cancelo
----------Laporte----------------Dias----------------Walker
Subs:
Foden/Sterling to replace Ferran/Jesus/Bernardo
Rodri to replace Gundogan
Mahrez to replace KdB
Mahrez could replace one of the front 3 instead, but honestly would like to see him in this central role, similar to what Mason Mount does for Englands 343, and what KdB would be doing in the setup.
Just trying to think outside the box here, I think Mahrez is in a rut out on the RW, Pep should move him centrally and try that out, his ball retention and creative passing (when he isn't selfish) is really good.