I140 has been approved or not, your new I485 will have to following the retrogression.
Even if you have refile I485, you have to make sure first that you are still legal in this country (H1 should be OK). Or else, sticking to your old case will be the best that you might want to do without leaving this country.