Retirement tax questions

YES you will amend the return LATER after the IRS has fully processed the original return.  Even a 1099-R with a code G in box 7 MUST be entered on the return  or the IRS will eventually send you an audit letter you will have to respond to later with guess what ... an amended return.   New this year, you can efile the amended return however you have until 10/15 to do so thus you don't need to rush.