No, don't amend your return until you get your refund. The IRS will reduce your refund by the amount of the second stimulus payment received. It is quite common situation and it isn't subject to penalties. If they proceed your 2020 tax return before sending the 3rd stimulus, they will use your 2020 income, otherwise they will use your 2019 income to calculate it.
