From this documentary I gather that Arab/Muslim leadership in contested areas like Judea/Samaria is the cause of violence.
The leadership requires a continuous dispute, out of which it derives donations from a duped West. With these donations the leadership lives high on the hog, funds Pay For Slay, and teaches religio-racism to it's youth, from toddlers on up.
The solution, then, as I see it, is one state called Israel which makes jihad illegal within its territory. That would mean the removal of any leadership witch has ever enacted any kind of law or teaching of children which aligns with jihad. Laws, for example, which prohibit the fraternization of Jews and Arabs.
Having been made illegal and in violation, then each iteration of leadership which breaks the law should be removed at least expense to civilians, but by any means necessary.
If the next leadership fails, after the removal of the PA, the leadership among Arab-Muslo-Palestinisns needs to be limited to city mayors, there nevermore being one leadership for all Arab-Muslo-Palestinians. That leadership, if any, would need to locate itself in some other country, like Qatar.
I consider both Judea/Samaria and Gaza to be, defacto Israeli territory either by the application of an old mandate, by declaration of Independence, and by the winning of three defensive wars.
Both Hamas and the PA need to go. Gazan leadership needs to be limited to mayoral levels, which would divide Gaza up into six or eight city districts. Judea may be given one more chance at one leadership over it's area, and failing that limited to mayoral posts. All of that leadership would need to follow Israeli law in regards jihad, especially the grooming of children.
If you disagree with any of this just know there already has been a two state solution. The other state is called Lebanon. Lebanon used to be a decent state which has been fucked up by jihad, and represents an even bigger threat than Hamas ever was. They have tunnels too. They have rockets too. Better tunnels, better rockets, more rockets, and a highly funded military aiming it's jihadist hatred at Israel.
The big picture is jihad. It's time the vanquished of Israel stop being used as pawns in a larger jihad. It's time Israel stopped allowing them to be used for jihad.