that is correct -
the stimulus that you are eligible for is all reconciled by the 2020 tax return; what ever occurred in 2018 and 2019 is as it never existed for stimulus purposes.
So you should receive $1200+600 in stimulus less whatever was sent to you directly by the IRS on the tax return.
Again, watch Line 30 on Form 1040 closely just before you file as the software is going to need some updates given the tax law changes of the other day.
