Yes, you can wait to amend your 2020 tax return until after you submit your 2021 return.
Yes, you would use your current information to calculate any tax due. Since you are getting corrected Forms you won't get penalized if they increase your tax.
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
