How would you rewrite the two sir?
First WCI.
Not having Sanji fighting Luffy, that fight made no sense at all.
Luffy defeating Cracker without Tankman gag. Would be way better if he used Snakeman right here or even KKG instead of defeating Doflamingo with it. I would also change Doffy fight so he would lost in just 1 run of G4.
Sanji's cake make Big Mom so happy that she fall asleep at least for sometime. Then she chases Strawhats in order to make Sanji her cook slaver.
Luffy clash with BM unleashing CoC haki and knocking out fodders, after that he goes back to base form without drawback.
Luffy using Future Sight in his Snakeman Form and his armament haki overcoming Katakuri's. Katakuri founding Flambee before she hits Luffy.
Now for Wano arc.
Luffy preventing Tama for being kidnapped next to him.
Kaido mocking Luffy for not damaging him.
Luffy being concerned about being one-shotted by Kaido not only about not damaging him.
Zoro not giving Shusui away.
Zoro telling Hiyori to fuck off.
Zoro killing Hioyri.
Zoro changing Sandai Kitetsu by Enma.
Enma not being a nerf with stupid magic powers.
Luffy stopping samurais other than Scabbards to go to Onigashima, ordering them to protect Wano country which they refuse but listen once Zoro tells them to obey(Zoro fulfilled his role to lead samurais)
Luffy and Kid walks around Onigashima unleashing CoC and knocking most of fodders
Initial matchups are made:
Kaido vs Scabbards(After Orochi and Kanjuro got killed, Kanjuro for good)
Big Mom vs Luffy and Kid
King vs Zoro
Queen vs Sanji
Jack vs Jinbei
Tobiroppo vs Strawhats + Killer
Law searching for Red Poneglyph and the rest of Law's and Kid's crew fighting fodders with the main one fighting Numbers.
After Scabbards got defeated and X-Drake made a deal with Killer the matchups changes. Drake and Killer goes for Queen, Sanji goes for King, Zoro goes for Big Mom and Luffy and Kid goes for Kaido.
Law shows up to save Scabbards and help captain trio to fight Kaido.
Everybody wins their matchups, Zoro makes Enma into black blade. Then literally everybody comes back with awakening(Except for Big Mom).
Alliance takes a huge L but Zoro revenge them by taking Kaido's head. Although they are in advantage Kaido's crew rampege with their awakenings attacking each other. At the end Marco, Chopper, Law helps to heal the alliance and escape from Onigashima which "explodes" drowning underwater.
Actually I got without ideas at the end because I can't think too much right now. May comeback later to change this.