GAHiker having the same case as yours and will efile in the way they are soon. Whatever needs further touch let IRS and its advocates and TT figure out for next year return. My 1040 and 8606 are fine in the way TT did which is in compliance with IRS guidelines.
