I really hope the bitcoin community is smart and drops the 2x fork. Let first see what the effect of Segwit is and wait for LN and RSK. If then the blocks are still full plan a hard fork long enough in advance where also other things get fixed. Probably it will not even be needed.