excess roth contribution

I have seen questions similar to this, but I have additional questions.  I made an excess Roth contribution for 2020 in March 2021 based on my 2020 stated W2 earnings.  I didn't catch the excess error until I was filing my 2021 return. Some of my earnings were from deferred income and were not so designation on my 2020 return. (I just figured this out). I could not determine how to amend my 2020 return (couldn't determine how to enter info in turbotax) so I filed my 2021 taxes,  completed form 5329 and paid the 6% penalty for 2021.  I removed the excess contribution in March 2022 prior to filing my 2021 taxes. I just received a 1099R for 2022 showing the removal of the excess contribution and the earnings.  If I report this form for on my 2022 taxes, I turbotax shows the 6% penatly, but it doesn't look like turbotax in adding taxes for the earnings.

My current solution appears to be......file an amended 2020 return modifying my 2020 earning to subtract the "differed income" This creates a form 5329 for 2020 and shows the 6% penalty.   Then amend the 2021 return utilizing the form 5329 from 2021.  The question then becomes how do I utilize the 1099R for 2022. Is that info entered on the 2021 amended return? Do I then disregard the form on my 2022 taxes?