"am now amending my 2020 and 2021 returns to indicate the repayment and recoup the taxes paid. "
You timely paid the distribution back, but you are just now amending to report that ??
Consult the sections on "amending" in the 2020, 2021, 2023 instructions for Form 8915.
It is no fun.
Note: you can amend to restore the correct "prior years basis" but you have missed the deadline
for amending a 2020 tax return for refund.
FYI : Caution: When Form 8606 prior years basis was involved, TurboTax 2020 did not produce the correct taxable amount in certain situations (namely, my situation) .
Note also that when Form 8915 is filed (or amended) ,the worksheets for Form 8915 are also to be attached.
@bbolsm82
