What do you think will be in the EE?

[The Saucepan Man]

they will show sam becomeing mayor
(because thats a question in the Trivial Pursuit Game)

If you look closely at the last few lines that Frodo is writing in the Red Book of Westmarch in the theatrical version, there is a reference to Sam becoming Mayor. So it doesn't need to be in the EE for it to be in the TP game.

The Witch King's confrontation with Gandalf will almost certainly be in, although not at the gate, since there is a scene where he appears over the wall mounted on his Fell Beast in front of Gandalf (and Pippin) on Shadowfax. My guess is that this happens as they are on their way to save Faramir. It makes sense that the Witch King breaks Gandalf's staff, given that he tells Gothmog before the battle that he will break the Wizard. It seems strange, though, that they left this line in the theatrical version once they decided to leave out the confrontation with Gandalf.