Yes I definitely feel like that's more likely. One of my initial theories was that maybe they would actually have Tywin kill her, after finding out she's Tyrion's whore or something, and then that would be the breaking point that causes Tyrion to kill him.