I agree with the principle of the pre '67 boundaries with the inevitable land-swaps, but think these need to be very carefully adjudicated for fairness by a mutually-agreed independent 3rd party - for example www.theelders.org/