I believe I found a solution using Turbotax Deluxe, but I have not completed my taxes for other reasons, so I don't know if Turbotax error checking will agree with me. I'd prefer not to have anyone else adopt my solution only to find there are problems with error checking or filing of the tax return. I believe can be reached through email to discuss this further.
