I share your frustration.
I also talked to several tax experts on the TurboTax last week, but they all gave me the confusing replies.
Finally I corrected it, based on our member Andrea here, and got my returns accepted!
His method was basically the same as yours.
By the way, I'm not sure if TurboTax fixed this issue yet, because I haven't received any notification from them.
