I am struggling with the 1116.

Client lived 1/2 in Germany and 1/2 in US. Initially, I just did the 2555 exclusion but that did  not exclude all income so I prepared the 1116 for the remainder I could take on the  overage.

I noticed then that the previous year accountant who is a US EXPAT tax help used only the foreign tax credit to wipe out all the liability plus some carryovers. I deleted the 2555 just preparing the 1116 and I get a best result but am feeling unsure. Does this seem appropriate to those of you who do this type of work all of the time?  

If this does sound appropriate I still get a critical diagnostic about SCH INC and the foreign W2 not having a EIN. I believe I've checked off all the other foreign address et al so am wondering if this will preclude me from filing electronically?