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.
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.