Excess Roth

I was ready to submit my tax when I realized that I’ve been contributing money to my Roth IRA for 2020, 2021, and 2022 when I’m not qualified. I’ve read several threads about excess Roth and I understand that for 2020 I will have to pay the 6% penalty each year, though the earnings for that year can stay in there? But for 2021 and 2022 contributions I could withdraw the amount without this penalty fee, though I will get tax on any earnings. I’ve just reported the excess amount to my Roth account today and since the deadline to file taxes is only a few days away, 1) do I file for an extension and wait for any 1099R to get send to me before I submit the tax? Or 2) do I go ahead and submit the tax and then do the 1099R stuff next year when I file 2022 taxes? I’m uncertain regarding the timing of when to file. Thanks for all the help in advance.