I would have made Luffy take the back seat on both Dressrosa and WCI.
Luffy would be trapped inside that tournament, while Zoro and Law would deal with the mess outside.
WCI would be a MUCH SHORTER arc, but it would be about the Zou SH's ALL getting taken to WCI. Sanji and Nami would take leading roles there and develop their relationship (love or no love). Sanji wouldn't take down a commander. He would take down either Oven or Daifuku, and they would run with Jinbei's help. BM would not come in Wano. Sanji would realize he needs to get stronger because the Yonkos are not the only threats. The YC's are all monsters on their own and he needs to step up. That's when the Raid Suit comes into play.
I would delete Udon. Give more focus on the SH's exploring Wano, especially Zoro. Luffy gets taken, but we dont waste chapters and chapters with some cheap training montage in Udon. By the time Luffy gets rescued, the WCI SH's arrive in Wano, but the rescuing mission would be for the SH's that ALREADY were in Wano, with Zoro being acknowledged by the samurais there.
Put the other SH's on the driving seat for a change. I think it's amazing how Oda doesn't have faith on his own characters except Luffy to carry the story.