Yeah they did a poor job imo with Tyrion's time as ruler of Mereen. Pretty much all of the scenes were pointless filler, other than a foolish treaty by Tyrion which goaded the masters into attacking so Dany could save the day in anti-climactic scene.
Along the lines of this, I wonder if that's the last we'll see of Kinvara? My gut tells me no since she had a pretty epic character introduction, but I'm not sure anymore to be honest the way they handled some of this season. And what place would she have in the story? I don't believe it would make any sense for Dany to take her to Westeros.