I ended up checking my forms instead of relying on the "step by step" information provided by TurboTax (you can switch views in the upper right hand corner). On the actual forms, my income was accounted correctly. Both 1099s still showed on there, but only the ROTH conversion was counted toward my income.
