I think that is almost a distinction without a difference. It is both. The horror of the holocaust in Europe provided the shock that allowed the full-scale ethnic cleansing of large parts of Palestine post-WWII.

For me the answer is clear. Israel needs to comply with international law: stop occupying Palestinian territories (among others), stop the genocide and ethnic cleansing, stop committing other war crimes, adhere to the 1967 borders with Palestine, stop funding Hamas (through Qatar), and support (finally) a two-state solution.

Easy? No. Clear? Yes.