Yamato will be taking the first mate role and Zoro will stay with Momo in Wano. It makes sense because he is a Shitmotsuki wannabe and the Shimotsuki think of the Kozuki's as Gods. Also, Zoro's role is Combatant, but Sanji and Jimbei are stronger anyway so he is useless.