You may NOT amend the 2021 return after the funds are repaid. Your 2 choices are as described by Mike9241.
The old post is basically still valid, except there is no longer a tax break for repayments of $3000 or less.
