Sorry to bring this back up, but what was the solution here? Was the software right or did you manually adjust something in the forms? Facing the exact same situation as you where adding foreign income increases taxable amount even though it should all be excluded.
