I definitely don't see this resolving itself overnight. That would be completely unrealistic. They will certainly fight again, and probably often, over this and other issues. But I think the gauntlet has been thrown down, and they are both aware that there is much more at stake now, as opposed to when they were fighting naively and not knowing what exactly they stood to lose. But yeah: this will take weeks, probably months to resolve.

As for my other option, I may make a post about this later. Several people have asked about it. ^_^

Thank you so very much for the kind rec. It was so wonderful to see it.