Better idea: Repeal now, effective immediately. Do not replace it. Claw back all payments made under the clearly unconstitutional law.
This is exactly what should be done. And the Republicans should put up a bill to this effect just before the mid-terms. Dare the Democrats to filibuster. The bill would pass and the Dems would get slaughtered in the mid-terms.