This is not complicated. Annex Judia and Sumaria, set declared boarders, give the rest to the Palestinians. No refugees, maybe some compensation, but finally firm boarders. Let the Palestinians declare a state, and if they cross the boarders declare a war. Really done thinking about it, just do it.
Man shot dead in northern Israel town of Bi'ina, police say the murder was gang related (Haaretz)
from the article: Palestinian leadership divided over plan to seek UN recognition