Yes, there is much waiting throughout; however, every phase should be handled as if processing will be performed immediately by agents who have an eagle eye toward every facet of how petitioners and their representatives approach the system.
Petition packages, now and throughout the entire process, should be submitted completely after reading the requirements carefully, interpreting instructions literally, and complying/responding completely and accurately. Your legal team appears to treat these basic obligations casually.
The foregoing is the crucial factor to adhere to, because -- as you've found -- assumptions about processing-time can be perilous. It's likely that if you handle resubmission yourselves and follow the above advice, outcomes will improve.