I don't really agree with your take that her DF being regarded as the "Guardian Deity of Wano" enforces the notion that she will leave. Yamato is still yet to do anything befitting of that title. Not to mention that she would have to be regarded as such by the Wano folk in the first place so if anything this DF reveal is a prelude to her taking up that role on Wano imo. Not to mention that this concept "Divine Protector of Wano" is something that has come up prior in the arc and was said in reference to Kaido. With Yamato, the people of Wano might actually get a proper "Guardian Deity" and fact that she is Oogami whatever lol will only make it more convincing to them
Also, by the time this whole Kaido saga is finished, chances are that there would only be a few scabbards left over. Not to mention, that Wano will open its borders after this arc, so it will be very vulnerable to attacks from the outside, so it's possible that Yamato decides to stay on Wano to protect for a bit even if it's only till they get back on their feet. Oden forsook his country for his dream and Wano fell into hell for 20 years as a a result so we might see Yamato making the opposite decision. (Personally I hate this whole Yamato/Oden *forced* parallel but if we we are gonna persist with it till the end then I reckon this is outcome is feasible).
Lastly, it is important to note that unlike Oden, she can leave Wano anytime she so chooses to after this arc. Oden only had one shot at it.
Also, by the time this whole Kaido saga is finished, chances are that there would only be a few scabbards left over. Not to mention, that Wano will open its borders after this arc, so it will be very vulnerable to attacks from the outside, so it's possible that Yamato decides to stay on Wano to protect for a bit even if it's only till they get back on their feet. Oden forsook his country for his dream and Wano fell into hell for 20 years as a a result so we might see Yamato making the opposite decision. (Personally I hate this whole Yamato/Oden *forced* parallel but if we we are gonna persist with it till the end then I reckon this is outcome is feasible).
Lastly, it is important to note that unlike Oden, she can leave Wano anytime she so chooses to after this arc. Oden only had one shot at it.
, Zoro walks with him 99% of the time when he isn't lost and has to hold Luffy back a bit, and thats when both Zoro and Sanji don't need to step up and prevent Luffy from doing his casual impulsive shit (and failing miserably) 
