Retirement tax questions

Do the amendment first.

then review 2022 Form 5329 and 2023 Form 5329