You are correct that you must amend both 2020 and 2021 for the 2020 excess and pay the 6% penalty each year since the excess was not removed until 2022. The 6% penalty repeats every year until removed.
In TurboTax on the amended return go to the Roth contribution interview and step through until it asks about an excess. Enter it and it will add a 5329 form for the penalty.
For the 2021 excess if you filed you 2021 return on time (by Apr 17, 2022) then you have until Oct. 15 2022 to get a "return of contribution" where only any earnings will be taxable. Be sure the financial institution will issue a 1099-R with box 7 code JP that will have to go on an amended 2021 return when the 1099-R is received in Jan of 2023.
**Disclaimer: This post is for discussion purposes only and is NOT tax advice. The author takes no responsibility for the accuracy of any information in this post.**
