One of the best fixes is to simply kill Shadowheart. Larian tries so hard to force her romance on you that she blocks everyone else's scenes. Apparently, Larian dislikes Gale, because his are always the last in the scene queue. Irritating. They made Shadowheart less irritating but I hate DMs forcing things on me and that includes Larian. The one way to make me not do something is to try to force me to.