After you file

The current "forever" version in which you enter the year

should work in this situation since no dollar amounts are chaning on 1040-X and will be EMPTY.

However the Form 8606 must be for the correct year each time.

@x46359