After you file

use 1040X to file a correct Form 8606. In Part III explanation, indicate that your submitted form corrects errors propagated  in prior years List those years.