After you file

Your choice.  But amending is no picnic.  If it were me, I would wait for the 1040X to use the software here.  Give it a week or two.  You have three years to amend.

**Disclaimer: Every effort has been made to offer the most correct information possible. The poster disclaims any legal responsibility for the accuracy of the information that is contained in this post.**