My first choice is BIP101, but if certain corners of the community are absolutely hellbent on torpedoing it through increasingly fraudulent means (the 'notXT' spoof client, impersonating satoshi, reddit and forum censorship, calling it an altcoin, general FUD or misinformation and all the other underhand and dishonest shit that's currently going on), I would settle on this proposal as a compromise or fallback.

However, we'll see if those currently engaged in said fraudulent activity are prepared to make any compromises themselves.