You missed the point but I hope you get it when I reply to your options.
1. One state, with Hamas and PIJ and PA and 75% of Palestinians supporting the destruction of Israel... How do we say in Oz? Yeah, Nah!
2. They've been offered that multiple times and each time the Pallies revert to sticking Jews rather than accept that as a solution.
Gaza and the WB are by default and practically separate entities. One could argue that there are Pallies living in Gaza, WB, Lebanon, Jordan, Syria etc, and that they are not a generic nor homogenous ethnic group. So I would deal with Gaza and the WB as two distinct and separate problems.
Gaza needs to have Hamas and PIJ removed as well as UNRWA - they together for too long have procured a mentality and society of death above life as being more important than peace and prosperity.
My solution after that.. Find those that want and to educate towards peace and support them both in governance and building a future whilst retaining a firm no violence policy.
The world's money coming in needs accountability - for far too long the world has supported perpetual Pally victimhood and hoped the problem will go away and turned a blind eye to the martyrdom mentality of what they were funding. Everyone has blood on their hands.
Re the WB I have other ideas that do not include the PA but the tribal families that actually run their towns and regions - not going to go into my ideas here now.
Re the UN. It is an entity that has barstardised its right to exist in its current form.