I think I may have found another bug. I've turned Keldorn down on my current playthrough, as my PC is romancing Edwin. Avoided the dialogue loop as stated above, then turned the romance off, and everything was happening normally until I hit Amkethran in ToB. After killing the mercenaries who where threatening Saemon Havarian, what appears to be a romance-related interjection starts, concerning how the mercenaries run rampant in the town. Keldorn's music starts playing, and he refers to my PC as "my love" at the end of the convo. But his PID menu is still the non-romanced one, and the Edwin romance is still active.
What I've seen of the early stages of the romance, however, encourages me to try the entire thing on my next playthrough