Don't wait. Apply NIW. In the future you can also apply EB1a/b. Timing is important. I think you have more than enough credentials. Don't feel bad. You will get it eventually.