I would say apply for your I-485 ASAP. This way, you'll start the 6-month clock on the 485 right away, and hopefully you will be able to stick around in your current company for that time.
Meanwhile, since your I-140 has been in for a year , there is a good chance it might get approved real...