Really good post. I really had no problems with the battle scene at all other than they really needed you to suspend disbelief at a few points, i.e. Jaime, Brienne, Pod, and Sam surviving the sea of walkers.
The plan was to lure him in as you said and very successful but the group at the helm...