I'm liking option two, declaring in the event of a war or major "set piece" engagement short of war.
However, it needs to be clarified. Once a player "declares" a side, would that be in effect for the duration of the war? Otherwise you'd constantly be taking headcounts or polls. Personally, I'd think it much easier if the player's choice committed him to the chosen faction until the dust settled.