I suggest you apply I-140 right away and get it over with. In the mean time prepare documents for I-485 so that you can apply for adjustment of status as soon as the date becomes current.