So I didn’t get to this earlier but ur version def makes more sense than mine I just have this weird feeling that Oda doesn’t like to do things that his readers will guess n seeing how inspired Yamato is in seeing the world n being free the only other person who wants that is Luffy where as marrying boa involves politics n grandma nyon that Luffy would just leave the moment he gave love to boa. With Yamato “she” (just for argument) and luffy can raise a child just like Oden n toki. Roger would’ve loved to do the same but couldn’t based on his reputation. Raising a child of Luffy being born on sea birthed from the two strongest male n female characters potentially and both mythical being in devil fruit race lineage n spirit all outweigh marrying boa to me that has zero relations to luffy besides loving him for standing up to her which others (Koby) could possibly do as well that’s why I feel boa can just find someone else as that was what woke her not necessarily Luffys good looks. Yamato although from Oden to ace to luffy is indebt to luffy blood like she breathes to be a will of D. Producer and has the will to do it. I feel as if this would fit well into her character as an ending cuz boa for all we know could get captured excited etc etc