I see no reason to file numerous forms.
Here's my suggestion:
Attach form 8606 to your current or next form 1040 filing..
Show the correct prior years basis (total of all non-deductible contributions)
OR if you made a non-deductible contribution last year,
file form 1040X and attach 8606
Show the correct prior years basis (total of all prior non-deductible contributions and the last contribution )
In 1040X Part iii explanation, state:
"Neglected to include form 8606"