At this point, migrating them to the west bank and then just closing off the borders with Palestine would probably be best. Pull back the Israeli settlers, give Palestine any lands that are majority Palestinians, and just shut off contact with them. The two sides aren't going to come to a unified living situation in the next 100 years, so giving them plenty of space to be their own nation and treating them like any other nation would be best.