Fixing excess RothIRA Contribution for several years

For the years of 2018-2021 I had my status as 'Married filing separate' so I was able to contribute $0 to my RothIRA. I did not think anything of it as a third party handles my Roth. Once I tried to file this years taxes TurboTax was nice enough to tell me I messed up.
So, I contributed $600 each year for 2018-2021, totaling $2400 excess. I now realize that I shouldn't have done that. For 2022 I only contributed $5700 and I changed my filing status to joint so I'm fine there.

 

From what I've gathered online all I need to do is:

File a 5329 for 2018, 2019, 2020, and 2021

Send a 6% penalty check for each year, including the next year(s). So $144 for the 2018 form. $108 for the 2019 form. $72 for the 2020 form. And $36 for the 2021 form

Then just not contribute $2100 to my 2023 Roth to absorb the excess from the years past and my 2022 Roth will absorb $300.

 

Is there anything else I am needing to do or file?