Yes but like, Luffy taking too long could be the difference between her ending up unconscious or too injured to fight anyone else, or defeated but still conscious an able to recover after Luffy tags along, depending on how much longer Oda plans the arc to go on for.
For example, if Luffy takes 3-5 chapters to return then the idea of her recovering for another full 1v1 matchup is plausible. But if it takes him like 15-20, then it's much more probable for the other matchups to happen and end in that time, probably leaving Yamato to witness the climax of the arc while still injured.
Granted we also haven't seen WHERE Yamato and Kaido are fighting yet lol