A much better scenario would be after scabbards get recovered enough vs Kaido, instead of repeating over and over thid mundane Kanjuro/Orochi plotline, have Raizo vs Fuku, Kinemon vs Kanjuro while rest of the scabbards vs CP0.
And switch up F6 fights, Brook vs P1, and Nami/Usopp vs Ulti, Tama could still have done her role of conroling gifters.
There's much more exciting ways to approach these plotpoints instead of the childish and mundane routes Oda took.