You could wait, but know that it is not always that the USCIS issues an RFE in this situation. They could outright deny your I-140 and I-485. They could also invalidate the EAD and you could find yourself in a serious situation without proper work authorization. Proactively complying with AC21 portability is recommended.
