Retirement tax questions

No, go ahead and e-file 2018 before you get 2017 amended.  Year to year doesn't affect most returns:  only if you have a carryover will it make a difference.