Not sure I understand all of your steps. For 2021 tax return client prepared themselves, do you suggest I put that the return was self prepared for what is considered the original return? I can't seem to get the 2021 amended to reflect if I put that the original return was E-filed, as soon as I do that the return switches from Amended on the E-File Center to Federal Return.

I did not have any issues doing amended 2020 returns.