Yeah Yamato is a nakama next chapter... finally!
Only weird thing is Kin and Momo the only people the SH didn't get to say goodbye but it's likely it's gotta be an emotional goodbye next chapter since they've been with us since Punk Hazard so they should get a least a proper one till we see them next time...

unless Oda suddenly pulls a "oh btw yeah they're coming too" .

but I highly doubt it after Momo speech last chapter. so we're good.