First things first. Married filing joint:
Your husband has an ITIN and you have been filing 'married joint' for a number of years. You have made a choice to file 'joint', and the IRS now considers your husband as a 'resident' US tax payer. You can 'undo' (revoke) this, but it comes with real, hard conclusions.
http://www.irs.gov/pub/irs-pdf/p54.pdfGo to page 7 of pub. 54. On that page is Table 1-1. If you wish to file 'married separate' from now on, read the table. You can get a divorce, but that does seem a bit extreme

If you read the 2nd paragraph just above the Table under
'Ending the choice', it makes clear that you may never, never, ever file any way but separate, ever again, as long as you are married. This could be a rather extreme step for your husband to make, given the unknowns that life can throw at you in the future.
I would suggest now that you have chosen to file 'married joint', you continue to file that way, and take the lumps.
EDIT: you still have the option to ignore 2555 and use the tax credits (1116) even when filing joint. If you do stop using 2555 after you have previously used it for a number of years, be aware of the difficulties for using it again within 5 years
(? unsure of the time. Check the instructions for 2555. It's been a long, long time since I've used it).