I'm not sure if my issue was the same, but I will say that I made a new tax return without "importing from last year" then manually filled everything out and eventually it came out to a reasonable number. Not sure if that'll help in your case, but that's what I ended up doing for mine and I think it worked out well.
