After you file

I am in the exact same situation re. my amended 2020 return. Are you saying I should use my original filed 2020 return AGI, etc. when I try to e-file my 2021 return with TurboTax in a couple of months? I'll have a big refund coming for 2021's return and would hope it won't be indefinitely delayed. Any advice would be greatly appreciated.