Retirement tax questions

Hello,

 

I have a similar situation to the one described by the original poster except that I had already filed before I found the mistake. The excess amounts were withdrawn in March. Vanguard kindly calculated the NIA, and I see a line in the transaction history indicating $35 for "Withholding--Federal."

 

I've put together amended returns for 2022 and 2023 but I'm unsure about how to handle the amendment for 2024. I'd like to avoid the 6% penalty for 2024 if possible.

 

Should I file an amendment for 2024 now that only includes the penalties from Form 5329? Do I deal with the distribution taxes on the 2025 return?

 

Thank you for any guidance you can give!