UN created this quagmire so let them sort it. Reset borders to the original plan, Jerusalem becomes its own city state, administered by the UN. It will anger everyone but let the UN take responsibility and clean up the mess they made (sort of).