Excess Roth IRA contribution

hello,
On 1-11-20, I contributed $7000 (I'm 64) to my Roth IRA for year 2020. When preparing my tax return for 2020 on 5-2021 (I filed for an extension), I realized that I did not qualify for a contribution to my Roth IRA for 2020 since my income was too high. Turbo tax told me to withdraw the contribution and any interest from the account which I did, and to wait until the following year to receive a 1099R, which I did. I did receive a 1099R for 2021, however, I neglected to tell my brokerage firm (Fidelity) that I was withdrawing the contribution and interest due to an excess contribution. The 1099R I received does not have a "P" code in Box 7, just a "T" code. I called Fidelity and asked them to amend the 1099R, but they said they cannot do that.

I'm wondering what my options are at this point. The only thing I can think of is to amend my 2020 return and use the misc income form? Any suggestions? thank you!