Or, even simpler, you can keep the basic events of the plot the same and just say Avoye is Aymar's cousin whom he loves like a sister and that's why he went to such lengths to try and save her.
Oh, that is genius! I am uncomfortable anyway with the slight incest vibes of Aymar and Avoye--not because they are cousins, actually, but because they grew up pretty much as brother and sister, and Broster even leans into that when describing them as a couple. I'd feel the same even if they hadn't been actually related.

Yes! And there are so many amazingly cute moments near the end, too... aww, there is potential in this ship. :)
Yes! The whole courtroom sequence is so great, you can really feel Broster just gleefully letting her id out. Aww, Laurent’s duel is adorable.