Your PD at BEC is the most important thing you have. The more pain you have at BEC, the less pain you have after you BEC labor is cleared.
If you can not file NIW this month forget about it.
If you can file EB1 after October it's still worth to do it. I believe EB1 will be at least 1 year faster in the long run. After this chaos stabilized, EB1 should be 1 year better than EB2.