do i enter both 1099Rs for this year as well as last year when I file amended tax return

Due to a bump in income, I recharacterized my Roth IRA into nondeductible IRA and then to a backdoor Roth IRA when I filed my 2021 taxes.  I filed it as nondeductible IRA in 4/2022 even though it wasn't recharacterized until 2/2022.  (could that be a problem?)

When I posted the two 1099Rs for 2022 tax, one with 7 as distribution code, and one with R, it says amended tax return for 2021 is needed.

As I entered the 1099Rs, it showed an increase of more than 2000s in tax each year.  Are the 1099Rs to be entered for both 2022 and the amended 2021 taxes?  It doesn't seem right to have to pay tax for both years.