Yeah, makes a lot of sense. I'm still unsure about Luffy vs Kaido though. A running theme in the arc is to work with others and not do everything solo which was Oden's downfall. The opening of Wano's borders is the ultimate realisation of this idea. That's why I thought Luffy would take on Kaido with his entire crew at his side whilst Kaido was just on his own.
But I can also see Luffy vs Kaido being a solo match in order to allow Luffy to directly challenge Kaido's legend (in a 1 v 1 bet on Kaido). Just wonder what Kid and Law would do since they're not the ones who are gonna bring the dawn yet they're fighting Meme right now.
Hence Marco and Yamato then, unless you think it has to be the crew specifically. I think assist is enough, which the two can provide.
Honestly, i think they gonna see that the Strawhats are too powerful. Oda tried to push the rivalry between the three, well since Udon with Luffy and Kid, then during the raid several times.
But on the rooftop, Luffy and Zoro were MVPs, with even Kid being astounded and impressed when Zoro cut the scales or nearly cut Kaidou, or when Luffy was pummeling Kaido with Kong Gatling.
Then they were shitting themselves when Jinbe joined before the raid.