It's hard to find ad hoc solutions for mistakes committed 63 years ago. However, without establishing a modern consitution based on the principles of Enlightenment, Droit de l'Hommes, meaning FREEDOM with all its facettes, there won't be any progress. I doubt whether Israel is prepared for such a step because it's lacking educational doctrines to provide such a historical step.
Chairman of U.S. Joint Chiefs of Staff says Iran deal lowers near-term atomic arms risk (Reuters)
from the article: Didn't we get carried away?