It sounds like you solved your issue?
We tried answering "no" to one of the questions that asked if this was a conversion to an outside RothIRA (I think). That deleted the entry on line 31 of the 1099-R summary, and listed the correct taxable amount as rollover.
