Since the 2020 amended return had to be mailed in and will take more than 6 months to process (could be more than a year) you do NOT need to wait ... you can file the 2021 amended form now.
