People can jump employers while one H1B, anyways, it's besides my point, which is:
Until the US had better visa programs, it would be a shame to dismantle the H1B program.
Don't let perfect be the enemy of good.
Make a replacement, then talk about changing H1B.