I ended up just not claiming the foreign tax credit, since it wasn't a large amount and it was worth it to me to e-file. If someone is aware of other tax preparation software that is able to handle this more gracefully, that would be useful knowledge to share. Who knows if this is going to still be a problem next year.
