Right, use the original 2022 as the starting point. No you don't have to wait for the IRS to process your 2021 amended return.
