Retirement tax questions

So to avoid the amended return, isn't it easier to just fie form 8606 with the 2020 return and list the funds as non deductible. Then make the withdrawal in 2021 and re-deposit in the IRA for 2021 as deductible? Seems like less paperwork and avoids the amended return.