your first solution is the strictly correct solution advocated by all the gurus.
Did you find that form?
Form 8606 can be filed by itself only if you are not required to file a tax return.
Attach 1999 Form 8606 to the Form 1040-X for that year.
Note; If no dollar amounts are changing, you can leave 1040-X line 1-23 EMPTY
In this manner of filing, you sign 1040-X, not 8606
Note to Note: I haven't looked at that old (example) 1040-X to see if any line numbers have moved.
I refer to the current Form 1040-X
mail 1040-X to the address in the current Instructions for Form 1040-X.
Aside:
For a Roth distribution you are allowed to enter your basis (prior contributions) no questions asked.
why not for a Traditional IRA?
@pillitto
