Base your 2021 tax return on correct information. That is, use your amended return as a starting point. There may be some confusion, but the IRS is used to this type of thing.
