I do not think this simplification works. A lot of the conflict is about systematic attempts at expansion of Israel itself - that is what settlements are and always were. Removal and mistreatment of original population went hand in hand with that.
We are talking about all settlements into territory that was not Israel's regardless of the year. The settlements like that are internationally illegal precisely because they are clear attempt to use civilian population as shields in a land takeover.
