The only permanent part of that “fix” is DACA. Once granted, amnesty cannot be walked back. A wall can be dismantled. Immigration restrictions can be loosened. But DACA green cards lead to naturalization and citizenship within 5 years. Why should Republican pols in border states have to deal with a flood of formerly illegal DACA voters for the next few decades? No DACA amnesty, ever.
I think we already know DACA is going to end up a separate issue. It’s been the one thing that’s kept things from moving forward....or it may be Trumps going to have to give certain concessions on that in order to get the rest of the full package wants. That is, after all, the Dems door stopper they’re using.