As you are married to a USC, even if you apply i-485 and they later deny it due to non presence of waiver at the time of application, you can reapply.
It's upon their discretion if they want to approve i-485 after waiver approval but with a pending waiver at the time of filing.
It's totally up to you as the worst you will lose is i-485 filing fee, but will avoid job loss on the good side.
Seeing your timeline, it might take another 6-8 months to get decision and then you will apply i-485, so you should expect a period without work authorization for sometime in this case