You could try a grx fd and crankset with 48/31 rings and see if that gets you adequate range. Radically changing your cassette would require drivetrain hacks and be a pain to switch to and fro with.
I'd see if a 48/31 with an 11-36 (just outside shimano spec but probably fine) could meet most of your needs with one drivetrain.