Why not just fork now? because both your suggestions will only fuel the hostilities even further, and this war can last for a long time. I think the primary thing should be to think about a hard fork that will remove things such as the ability to freeze stake and other limitations, in addition to revisiting the voting mechanism for witnesses (number of votes/how the vote value is defined/the number of consensus witnesses/decaying vote).
We need long term solutions so such events don't happen again in the future. If you remove the biggest guy in the room, then the one after him will become the next big guy. Hence why forking Tron out will only delay the inevitable, we should instead opt for a permanent solution.
It's all come down to this, doing the right thing to make the chain immune against ideology and change of mood. If we are going to start a war each time a community takes over, the chain will not thrive. We need to avoid a clash of civilization on the chain, we need changes that don't violate the property of users. It's a small price to pay, but it will play in our favor in the long run.
RE: Witness Update - @timcliff's witness node is re-activated