Retirement tax questions

The excesses were pulled out in March so I believe there's no penalty for 2024.

 

I guess the main question at this point is when should I file the amendment for 2024. I won't get the 1099R until January. Should I just wait and file then?

 

Thanks for your input.