Calling it "course-correct" is probably a nice way of putting it. The show is just primarily interested in shock value, rather than in love with it's nuanced characters.
It's why it's necessary to open yet another Oberyn dialog today with an edgy sex scene. It's why Jamie appears to be working towards deceny one episode and is raping someone the next. It's why the Wildlings are suddenly murderous Star Trek villains. It's why the Red Wedding was made to be more unexpected and more heartbreaking.
When they have Tyrion murder Shae, it won't be some attempt to "fix" his character the way it should be. The show could not give two shits about correcting Tyrion's character. It's all just about setting up the next shocking blindside that will get people talking about the show. Even better if Tyrion appears like a great human being before being thrown into a murderous rage. More shocking that way!