The SHs honestly should have went to Elbaf before Wano. Big Mom's arc should end with Elbaf, but she's overstayed her welcome now.
We could have had a way more believable jump in power as well before Wano, instead of cramming in bullshit power up's in the same arc that they need to be used. The Giants have been claimed to be extremely powerful (even though we've seen very little proof of this in the current story). Have Big Mom be in a food coma for a few weeks after eating the Wedding Cake, than give the SH's that time to train with the most powerful Giants, all unlocking new abilities. Big Mom wakes up, Perospero and a few members of the Big Mom crew have followed the SH's and send back word to Big Mom that they are on Elbaf. Big Mom shows up there, and goes down there against a much more improved full SH crew and team of Giants.