I didn't vote, since I think these options are rather simplistic.
I think that's unavoidable in such polls.
Thanks for giving a serious and elaborate answer. I mostly agree with you, but I tend to think a Palestinian incorporation of (most of) Jordan is unavoidable in the long run, which would be fair given population distribution.
Do you have the map of the Annapolis plan?
That's it. I would remove a 'tail' from Mezodot Yehuda to Hebron; in the north, Ariel and the area to its north would become an Israeli exclave; and, lastly, I might add bits of the Green Triangle.
West Bank + Gaza
I have indicated my preference in the past for the entire city of Jerusalem to be an independent city under UN protection.
Israeli Arabs who wish to remain in Israel will be provided alternative housing and recompense by the Israeli government.
Any plan that presumes to treat Israeli Arabs differently from Israeli Jews when it comes to the possibility of trading areas with Israeli residents for areas with Palestinians should be a non-starter. It's a fundamentally racist premise to start with to assume that Israeli Arabs should automatically be "okay" with living in a Palestinian state. ...which is why in my own post I noted that Israeli citizens -- Jewish or Arab -- should not be compelled to live in the future Palestinian state if they do not wish it.
Where land tradeoffs happen and you end up with Israelis in Palestine or Palestinians in Israel, there ought to be a hard and fast rule that neither government has the right to force or encourage non-native residents to relocate to the other country.
Sure, but there ought to be mechanisms in place to allow Israelis stuck in Palestine or Palestinians stuck in Israel to do so if they wish. Hopefully an evacuation of settlers beforehand will keep these issues to a minimum within the West Bank itself, but if parts of pre-1967 Israel become a part of the future Palestine (which is frequently a part of these plans) these sorts of issues will arise.