I have to say that this was one of the more disorienting episodes I have seen so far watching TOS in the remastered episode order. This episode could have been so good, it could have even been great thanks to some outstanding guest performances from France Nuyen and Jay Robinson, a solid premise and the Enterprise as the set and setting.
The problems lies in the sudden and jerky change of focus and plot. As soon as Kirk touched Elaan's tears around midway in, the entire episode was essentially restarted. The arranged marriage is now a background element rather than the primary focus, the Dohlman is now docile and agreeable with her "monstrous savagery" seemingly forgotten and then there is the contrived sabotage angle and shoe-horning of Klingons.
I, personally, wanted to see Kirk and company make a civilized woman out of that royal ingrate. Perhaps taking a turn for comedy or maybe even a memorable Kirk speech about the significance of tolerance for others' customs, etiquette and universal respect.
...But we got a rushed ship duel scene and a bad love story instead.
Now normally I would love to see a damaged Enterprise take on a warbird and swiftly turn a sure defeat into a close victory but I was irritably thrown off by how the original crisis, a fresh and interesting one, was discarded in favor of the Klingons breaking the treaty of the billionth time. Even at the end of the episode it doesn't really seem like the Dohlman has learned anything or grown at all, complaining about her responsibilities and only begrudgingly going along due only to Kirk's insistence (whom she seems to have fallen into a spell for and not the other way around

). And if she has developed it was not truly demonstrated as to how and in what way.
Just a frustrating one overall...