@fanfare, thanks for the workaround. I just went through it in detail, and it looks like it will work. I should still be able to efile, and just need to send a short 1040-X with the new 8606 form in the mail. If I could mark more than one answer as correct, I'd mark yours as well.
