A friend of mine came up with a solution i hadn't thought of previously. He said, "How about a three state solution? An Israel, a Palestine, and a Jerusalem."
The third state (Jerusalem), would be its own city state much like Vatican City...
Any thoughts?