Retirement tax questions

You must amend your 2015 tax return to remove this 2016 income from your 2015 tax return and obtain a refund.

You must report and all of this income on your 2016 tax return.  It is all 2016 income, not 2015 income.