My solution this year was to ditch TurboTax and have it done by a real human. Several hours on the phone last year for what seemed like an easy fix.
