Yes, you should wait until after Form 2210 is available to file.
Form 2210 is used to determine whether or not you have to pay a penalty for not making enough estimated tax payments. It is likely that the penalty will be waived with your Form 2210.
You should wait until after Form 2210 is available to file your return, but you can pay the taxes sooner if you want to. The IRS has several payment options on their website.
Click here to see the IRS payment page.