If USCIS approve u I485 directly, then you are luck! However, you need to hold similar types of Jobs for NIW during the I485 pending until your 485 approved in theory.
If I were you, I would wait until GC in hand.
If I were you, I would wait until GC in hand.