I fully agree with your solution, this actually would be the most morally and historically just. But for the means to achieve that, I think you are dreaming. It would require the palestinian themselves to realize what is best for them, and they have failed to do so for 60+ years.
Yemeni ISIS affiliate claims responsibility for Sanaa mosque bombing (Reuters)
from the article: At least 300,000 Gazans rally to mark Hamas' 20th anniversary