We'd wait for applying for the third stage till the dates become current. Hopefully, there is some traction on CIR for legal immigrants or USCIS makes some administrative fixes like allowing to apply for I-485 even when the dates are not current or EB visa numbers lost in previous years are recaptured. I am quite hopeful that by next summer, even if CIR doesn't pass congress, one of the two admin fixes will be implemented.
Keeping the fingers crossed!!! :)