You are still assuming the sbow follows the books...which its been said it is not. So the troll could be the dialog all together. I believe he is the rightful king amd him amd his aunt will unite under 1 house to rule. BUT there ks something about that dialog. Why not have her say it completly. Why tease. Something is off about it.
Also i agree tyrion will somehow become big. The "good" characters r all on same page now. So what happens
Actually the two scenes that seal the deal with Jon, the flashback Bran saw as the Three Eyed Raven, and the discussion with Gilly in this last episode, haven't happened in the books, at all.
In the books, Bran has only just got to the Three Eyed Raven and started his training. Sam has only *just* arrived at The Citadel and barely even started training. Lastly in the books, Jon is dead(still). Edit 2: It's been 6 years since the last book came out, every single storyline in the show blew past what's in the books a season ago(some story lines went past where the books are at 2 seasons ago).
The books and the show both have the same history behind the start of Robert's Rebellion, the show is at the point that we have even more information than what we know in the books.
So everything I'm basing it on is dialogue in the show and the history(that still matches between the books and the tv show).
Sam cutting off Gilly mid-speech was a subtle nod that, it doesn't matter if Jon is the rightful king. First the Nights King needs to be stopped, Rhaegar's annulment, Jon's right to the throne, who Dany is gonna marry, the dragons, The Iron Throne, Cersei and her pregnancy, none of that matters in the face of a threat like The Night's King.
Edit: Also the seasons almost always have a theme. This season is almost certainly illuminated by Ollena Tyrells discussion with Dany. Enough with clever men and clever plans, she's a dragon and needs to act like one. This seasons theme is almost certainly, there's been 6 seasons of clever men with clever plans, its time for action. No one is gonna stop The Nights King with clever plans, no one is gonna stop Cersei with clever plans(anyone who could have was sort of blown up), no one is gonna stop the Greyjoys with clever plans.