EB1A plus NIW for sure
I think that you should really try both. Not too much eextra work. Your credential is not bad for EB1A at all. You can check my previous post for some reference. Now EB2 is stuck there and no one know when PD will move forward.