Two choices:
1. Apply NIW now, get PD earlier. You should get NIW-I140 approved because your background is stronger than another people who get approved in the same field as yours, as mentioned by "128136".
Then you can wait for filling I-485 as long as your PD becomes current in the future..
2. If you enjoy research, postdoc--Faculty is a good research career for you. You can apply I-140 EB1b (OR) as long as you get a faculty position in the future. But this will delay your PD.