Thanks to einmaliger and XiaoBaiTu.
I guess the only way I can do it is to file I140 and I485 concurrently for another EB1. I would like it to be NIW, but since now NIW is also second category, so I cannot do that any more, right.
If Sept has any retrogress on visa number, maybe EB1 concurrently filing is the only way to go.