Your credential is high enough for EB1-A or B. You were just extremely unlucky with the reviewer. I would not be afraid of going for EB1, especially If your company can sponsor. Recent approval rate of EB1-B (sponsored) is nearly (or even slightly over) 90%. This of course includes cases that were significantly weaker than yours. The odd for you to get same reviewer would be extremely low. So I would not worry.