In the end, though, and as impossible as it seems, I agree with Avi Shlaim, there is only one state. The ethno supremacy needs to go and all people granted citizenship and right of return. This is not a small task.
The problem with the two state solution is those settlers and even then, Israel will always plot to make Palestine a vassal state or to destabilize it. The two state solution has always been a delaying manouver.