No way, I don't see how anyone watched episode 1015 and can still think Yamato isn't joining the crew? Other people have explained this better than me. But Oda cares a lot about themes. And Yamato fits the theme of the characters that have joined.
And she does fit the theme of Oden. Oden was...