Deductions & credits

Am I correct that I need to start by amending my 2020 return? It took me awhile to figure our why turbotax kept saying I was eligible to contribute.  Turns out the W2 for deferred income was being counted as "earned income."  The only way I see to fix this is to reclassify the deferred income. That generates a form 5329 for 2020. I can then amend my 2021 return to correct the 2021 form 5329.