Retirement tax questions

It took forever for the amended return to be processed.  Rather than amend 2021 “again” for form 8606 can I just go forward with the basis from 2020 when I file 2022?  The net effect is tax was a little too high in 2021.  Have held up filing final 2022 waiting for IRS to process amendment plus needed K3.