I see more and more bs with Yamato hoping onto the wrong ship, usually even if some fake info is repeated a tremendous amount of times, it somewhat has some truth to it.
If I had to guess Oda will flex hiw remaining brain cell to try and portray some amazing retard Oden moment. Yamato will hop onto Kidd or Law's ship and the next time they meet Yamato will just hop onto SHs ship.
Or Law just teleports her on the sunny and that's it.