Late Backdoor Roth IRA recharacterization/conversion

Trying to figure out how to handle this situation from 2021/2022.

 

I contributed $4,200 to my Roth IRA at the end of 2021. However, I realized that I made over the limit to contribute to a Roth IRA, so in March 2022 I recharacterized it (now worth $3,600) into a Traditional IRA, and then converted that back into the Roth IRA (i.e. backdoor Roth). The problem is, my broker did not issue me a 1099-R for 2021. So in 2022, I did a regular backdoor Roth for $6,000, but now my 1099-R for 2022 shows $9,600! (conversion amount for 2021 + 2022).  Also, I now have a 2022 1099-R for my Roth IRA showing a gross distribution of $3,600 as distribution code R.

 

How do I fix this? Should I go back and amend my 2021 tax returns? I tried doing this through TurboTax (I filed myself there in 2021), but it asks Did you get a 1099-R in 2021? Since I didn't, I hit No and can't go through the process.  Should I select Yes even though my broker didn't give me a 1099-R for 2021?