Yes to everything, including the 2020 credits (the 2021 income threshold is lower than the 2020 income threshold).
Be aware that a superseding Form 1040 can not be e-filed, it will need to be filed by mail.
