You need a three state solution and an international city.
Let the West Bank become Fatah land.
Gaza is it's own country.
Jerusalem becomes an international city open for governments and embassies.
You also need one USA old style battleship, the kind that IS A PURE TERROR WEAPON. They will be too busy to fire at your cities if you launch a one for one strike against Gaza for each missile they fire.
The West Bank can become a monarchy with the queen of Jordan being the new monarch. It provided a non corrupt government head and automatic ties to Jordan.
Which is a long term positive.
The Saudis have many princes that have no chance of ever ruling. A Saudi king married to a Hamas supporter, would give Gaza some respect . And the new Saudi king would be expected to bring significant financial resources with him.
Enlarge the proper city of Jerusalem, so that other countries would be able to build embassies there.
You have tried the same thing for years. Try something new.
After you knock out Iran. Obama does not have your back, the sooner the attack the better.