Just throwing another random idea out there (based on my decades of experience on the Macedonia name dispute). A possible option for a two state solution is where the Palestinian state and people are no longer called Palestinians but something more closely related to the borders of their new state. For as long as they call themselves Palestinians a large portion of them will see Israel as occupied territory, Names and territorial association are part of identity formation.