Yeah probably and it sucks.
I did notice/learn about a few details in the ending sequence that gave me a little better feeling in terms of story telling.
OK, I can't get spoiler tags to work so GAME OF THRONES SPOILERS AHEAD
Jon tried to sacrifice himself for Arya at the end. You don't see her, but Viserion is guarding the Godswood and right before Jon Snow stands up and yells you see his expression change like he's seen something. He then stands up immediately and yells go three times toward Viserion, but was actually speaking to Arya. Next shot is WW's hair blowing as Arya enters the Godswood. It at least tells me Jon did have a part to play in that particular prophecy, but that he also has a final sacrifice to make. Also, when NK walks up to Bran, Bran looks directly where Arya eventually stabs him and NK gives him a confused smirk back. Bran knew how it would play out going back even to when he gave Arya the Catspaw.
Also, Kit Harrington said ep. 4 is one of his favorites ever, and mentions how everyone has been lulled into this sense of security. Curious what that means.