Retirement tax questions

The good news is that you don't have to be in a rush to amend the return ... wait for the original return to be fully processed and the original refund is in hand or the original balance due is paid and then complete the amendment process.   The 1040X will not be available until later this month  and when you have completed it you can efile it now.