Highly likely. Oda invested too much into Yamato's design, character (even though it's shit), and powers for her just to be thrown away on Wano. On top of that, I said before, Wano is gonna get attacked by Teach, so what does Yamato do after losing to Teach? Go join the strowhats. I know we don't like her, she's shit, but it's going to happen.