I think you should wait for a federal draw as it might go low this time too compared to last time. Also, this is a quick process in comparison to Pnp processing. So, you should certainly wait for next draw n meanwhile, you can start collecting the documents required for submitting application...