Pretty much, I understand some translations have the concept art say something like "They can't find out I'm a woman." or "Is it so wrong to be a woman?"
Despite everything, I still don't get the feeling Yamato has abandoned her female birth gender, and isn't the same as Kiku either. It makes me inclined to think that final version manga Yamato indeed hasn't abandoned it, and simply just wants to carry on Oden's will and wanting freedom, but not at the cost of sacrificing her birth identity altogether.
Apparently so since Kaido says son, even though Oda was the one who wrote that.
At this point, I don’t think either side is wrong to call Yamato male or female. There’s only so much one side can point to try to invalidate the other without leaving skeptics, but skeptics still persist. If any of the examples were really that obvious, then it would have been settled long ago like with Kiku, yet still some are pointing to things like Yamato taking a bath with men even though Yamato’s infobox said daughter, and try to explain it away as fast as possible even though Yamato hasn’t said she dislikes being called a daughter.
I suppose once again it will be left up to Yamato’s post-Wano thoughts after sailing away with Luffy and coming to terms with Oden to provide a possible “ultimate example” and show as to whether or not she has truly left behind her female birth gender.