Fair point. I would like to be little bit more optimistic though
What turns out in the final conference report depends on what the republican solution looks like.
Republican solutions seems to be putting bandaids to where it is currently bleeding. Senate solution is a complete switch to new system. Both are very difficult to conference anyway except for portions like E-Verify, Border Security, etc.
If republican solution is too far right, it would be difficult to get the bill passed through both chambers. Far Left and Far Right elements will not vote for the final centrist solution. Any CIR bill in current climate can only pass with help of centrist people on both parties.
As long as the process is moving forward in the house, there should be a window(may be after the primaries if that makes the final vote easier) where this can be pushed in. We have to wait for the Markups of the actual bills for the republican solution to see if they are keen on moving the process forward at all.