I think that last agenda question is an important one, though I've not ended up in one of those no money situations where I couldn't score War, at least so far, but I can see EC being a good choice again.
Another decision is what to cut for Tollbooth, if you're going to play it. I'm currently on 2x eli, 2x Architect, 2x Crisium, 3x Howard, 1x Caprice, 2x food. Architect has still been amazing. More people are ready to facecheck stuff since they assume fewer Architects.