NIW is actually more difficult.
If one has accurate qualification for EB1,one should go for it as it doesn\'t need to prove much but for NIW regardless qualification it is big pain to prove how job condition should be waived.
Just one suggestion to you from what I spoke with IIO VSC. I had similar case like you, but I got approval for NIW and got RFE for EB1. Since I had already approval, I didnot care for submitting RFE for EB1. But I spoke with IIO about the same, and she suggetsed to withdraw the later case officially otherwise, it remains on your record as "abondaned".
So I just wrote one line letter with case # reference and requested them to withdraw the case. I withdrew it in the second week of January but so far I have not received any communication. In the mean time I got all set with my CP, got GC in hand and "Welcome Notice" from INS.