I can't possibly take the task of completely rewriting that giant mess of an arc, but here's a few superficial changes that would make the arc significantly more enjoyable IMO.

Delete Hyori and Yamato, they are unnecessary characters that only ate the precious page space.

Make Orochi a really strong and competent villain and have him replace Alber as Kaido's right hand and Zoro's opponent, he is now both the "King" of Kaido's crew and the shogun of Wano. The evil samurai ruler of Wano fits much better as Zoro's opponent and their antagonism couple have been built during act 2 of Wano. Orochi would have killed Yasu similar to the original Wano and Zoro would have sworn to behead Orochi and actually followed through on that promise. Also give Zoro a bit more spotlight in general, maybe reveal more of his lineage and tell us more about Ryuma, give Zoro a bit more spotlight against Kaido.

And then have Alber replace Queen as Udon's head jailer (he even already has a uniform fitting a jailer) and Sanji's opponent; Alber's and Sanji fighting styles would make for a much more interesting match up. Alber also should have given Luffy much harder time in Udon, I really don't like how comfortable Luffy was in Udon, it completely undermined the consequences of him losing to Kaido. He could have still gotten the ryou training (maybe even together with Kid this time?), but just don't make the guards complete clowns and make Luffy and Kid actually struggle and regret their rushed actions.

Speaking of Kid, make him much stronger, give him better haki and more impressive awakening, let him actually carry the fight against Big Mom, and maybe at least some small flashback that would explain his motivation. Give Big Mom the awakening and let her use coc coating against Kid and Law.

Make Queen replace Sasaki as a flying six, him and Franky are both quirky cyborgs and could have had a fun dynamic in their fight. (Delete Sasaki in the process).

Let Kaido kill Kinemon on the roof, once Luffy reaches the rooftop he sees Kinemon's last moments and hears his final speech.

Make Ashura and Izo's death more dramatic. Maybe also actually kill Kiku too.

Let Usopp actually fight and win against Page One, develop his observation haki through that fight.

Give Momo much more spotlight during the raid. After he has been aged up let him fight and boro breath some beast pirate fodder and put to practice the sword training he got from Zoro in his hybrid form. Let him actually lead some of the samurai during the battle (don't make Momo to badass tho, he would be very awkward in battle; the samurai would ask him for orders and he would say something stupid before Denjiro or someone steps in and gives him hints on what to say). But closer to the very end of the battle Momo would actually acquire more confidence in himself. Let Kaido and Orochi see Momonosuke in the adult human form and react as if Oden had returned.

Give Kaido df awakening and expand on his flashback, explain where and why he got his "death completes a person" philosophy.

Make it so Oden never traveled with WB, make Roger be the who got shipwrecked in Wano 30 years ago. Would have solved the plot hole with Whitebeard not coming to Wano.

That's about all, may add something in the comments later. Let me know what you think about the changes I suggested.