You just need one approved I140. No problem for ignoring the EB1 RFE. This happened to my friend. I filed under two categoris too, and my I485 went with NIW.