[Tom4784]

The War for the Throne will eventually lead to Dany vs Jon anyway since this episode all but confirmed he is the rightful heir to the throne so it's not all going to be Dany vs Cersei.

The White Walkers won't be around for much longer simply because they aren't an entity that can be shown and used repeatedly for both budgetary and creative reasons so they won't be able to hold an entire season as the central villains because they aren't characters that can be developed or interacted with outside of battle, the whole point of them from a narrative perspective will likely be to cause the team up against them which will eventually lead to the endgame war for the Throne.