Retirement tax questions

It is my opinion that you will need to amend last year's return. If you don't it could get more complicated trying to explain what you have done. The logic may be entirely correct, but since the IRS considers each year's return separately, it is best to do the correction of the return filed in error. If you used TT last year, you can use the software provided to amend your 2016 return.