Retirement tax questions

Yes, this is correct.

Also double-check on the corrected W-2 that the code D amount in box 12 was reduced by the same amount as the box 1 amount was increased.