I believe deploying a HF after the Segwit update will be much smoother than doing it in this current condition.