Her storyline was truly awkward because D&D made the mistake of changing her character in the first place. GRRM was right to worry that it might be a problem down the line. In the book, her death was still upsetting even though she was more whore than woman in love. She's so boring too.
I felt sick inside during the whole Joff/Tyrion-Dwarf display. ST did some of the finest face acting I've ever seen. I think it was always obvious that Tyrion had nothing to do with this. He was railroaded from the beginning.