You are setting yourself up for disappointment if you think Yamato is anything more than the princess/damsel of this arc. She’s following the exact same trends every other damsel is the series has:
-Wants to overthrow/defeat the main villain of the arc (Kaido)
-Is inspired by someone else for their motivations (Oden)
-Tries to fight the main villain of the arc but ends up getting saved by Luffy (Upcoming)
Vivi, Rebecca, and Shirahoshi (besides the fighting main villain thing) all follow this trend
When she gets her eventual clash with Kaido and she gets no diffed, she is gonna be on the ground crying and that’s when Luffy is gonna save her, I’m calling it