I'd honestly be surprised if Yamato doesn't join the crew.
As for Carrot, I'm not sure - the scene with her in 1056 seemed like it was meant to wrap up her storyline until the Minks and everyone else returned for the final war, but if that's what it was meant to do, it seemed like a really awkward/rushed way to do it, with Carrot being forced into a role that she has no desire to fill and no confidence in her ability to do the job in question without having any say in the matter, and her only qualifications being "well, you left Zou for a week, so I guess that's good enough."
I don't know if it was hastily included as a way to acknowledge Carrot's popularity, but if that's the case, then you would think that she would have been convinced by the end of it, and she still looked unsure. (and the "your heart carries Pedro's will" claim seems weird in this context, since Pedro's will had nothing to do with leading Zou)
Either way, hopefully this will be made clear in the next few chapters. I'm guessing that Kinemon and Momo will get their big dramatic goodbyes next chapter, and the Straw Hats will be out at sea in 1058 - if either of them are joining, whether they got on at the end of Wano or have stowed away, it seems like it would be revealed there, though maybe we'll get reactions and news from around the world before we go back to following the Straw Hats out at sea.