B Jenkins wants 1967 borders but I don't see how a state can function separated by a hostile neighbor. What precedence of success in that kind of arrangement can we refer to? If it's void of international peacekeepers, that idea would be an immediate mess and fail quickly resulting in Israel steamrolling the new state with military force, veritably overnight. 1947 borders are appropriate to the bureaucratic process we need to recognize the two states Israel and Palestine in the first place, or else the land swaps must be substantial, giving the northern half to one state and the southern half to the other. Micro-issues like right of return are superfluous and serve only to roadblock two-state progress; when Palestine has statehood Israel doesn't have a voice in who does or doesn't return.
With the 1947 borders you would basically have Tel Aviv cutoff from Jerusalem. Difficult to see that happening IMO.