I'm in agreement with you to be honest. I expected the battle against Cersei to be the one that was ended quickly, and then the battle against the WW to be the one that took place over multiple episodes and/or was even carried on after the show - I expected something similar to the Age of Heroes, if you're familiar with the books, where the Long Night occurs, but there's hope in having people fighting on. Now that seems to be turned on it's head a bit, which I'm okay with... but Cersei seriously needs to die. Now.