Yea, this season is really making me miss the books, and I have less and less faith in the showrunners' abilities.

On Jon's near death: I was definitely expecting Zombie Dragon, but was momentarily wondering if they might kill both Jon and the dragon to have them resurrect together through some sort of Targaryen-Dragon blood mixing in the icy depths.