that is correct if the repayment was in a year after the income was received. you do not amend your return for the changes in 3-6.
not sure what years are involved but here's the rule for reclaiming the income taxes you paid on the original amount which I assume was included in box 1 wages
for the year of repayment if the gross was $3,000 or more:
1) you can take a deduction on Schedule A line 16 the gross amount repaid and note it as iRC 1341 repayment OR
2) recompute the taxes in the year you received the payment by excluding it from income. The decrease in taxes is taken as a credit in the year of repayment on schedule 3 line 13b
if less than $3,000 you can only use option 1)