I'm probably going to have to go to Israel and then Saudi this year with work, so similar problem. A colleague has told me you can either get a 'spare' passport, or can get a special page put in your passport which they can stamp in the dodgy country (cuba/israel) that can then be removed.
Haven't looked into it though, so might be rubbish.