My money has always been on Yamato putting off his desire to go to sea until Wano is rebuilt, joining the Sunny for the Final Voyage where presumably he'll be desperately needed for the final conflict. By then he'll have had plenty of time to help Momo level up, and both of them will be there for Laugh Tale.
Alternatively, Yamato joins them for Elbaf or whatever is coming up next, but swaps out with Momo for the Final Voyage so he can be Wano's protector in Momo's stead. I think this one is a bit more likely, given the fact Yamato's DF is specifically said to be a protector deity of Wano.
Either way, one or both of them need to be present for Laugh Tale and the secret history and Throne War and all that jazz.
Alternatively, Yamato joins them for Elbaf or whatever is coming up next, but swaps out with Momo for the Final Voyage so he can be Wano's protector in Momo's stead. I think this one is a bit more likely, given the fact Yamato's DF is specifically said to be a protector deity of Wano.
Either way, one or both of them need to be present for Laugh Tale and the secret history and Throne War and all that jazz.