Naive Americans always think in terms of solutions. As soon as you do this you're going down the wrong policy road. Ask instead how to mitigate a conflict between a wealthy and wildly successful Startup Nation that gives its minorities equal rights and a genocidal jihadi death and martyrdom ideology whose highest purpose is killing Jews. Ask instead what examples of ideological deprogramming in recent history (Japan, Tamil Tigers in Sri Lanka, Al Qaeda in Saudi Arabia and the UAE) we can draw on to definitively send this ideology to the dustbin of history.
In the misgoverned Muslim Middle East, disaster is mitigated, not solved while malignant ideologies remain undefeated. They've had a misgovernment problem since Ali and the Shia-Sunni schism was triggered by a succession crisis and civil war. The only route out of rule by law kleptocracy to rule of law is secular governance, which they'll never do.
Listen to Dan Schueftan,former national security advisor to several Israeli PMs: https://www.youtube.com/results?search_query=Dan+Schueftan+solutions
Second, you're naively swallowing the Nakba myth. The Arabs left because their leaders told them to:
https://medium.com/lessons-from-history/palestinians-nakba-stolen-land-myth-ac8d1849166d
Listen to the Arab witnesses, including Mahmoud Abbas, who tell this story: https://palwatch.org/page/35117
And the majority were recent immigrants from other Arab states attracted by Jewish capital and job opportunities with the British mandatory government. https://medium.com/lessons-from-history/israel-settler-colonialists-32e515e4d2b1
Please explain how the grandson of a Yemeni Muslim immigrant to Ottoman or mandatory is indigenous, while a Yemeni Jew is a "white settler colonialist."