[hilbert42]

"Unfortunately these systems are incompatible. I think a lot of the friction we are seeing in modern times can partially be traced to this contradiction."

I'm pretty certain you're correct but I won't attempt to justify it detail here as we have to bring out the political philosophy texts on mass.

In the light of the English Civil War many thought about politics and freedoms Locke being one, his contemporary [almost] Thomas Hobbes with a different position—the Leviathan. Rights, freedoms and social contract theory was still raging nearly a century later with Rousseau whingeing about man being born free but everywhere he's in chains—opening line of the Social Contract. And there's still no universally agreed consensus.

Over the centuries political philosophy has covered almost every conceivable interpretation/position about the rights and powers of the State versus individual freedoms, so it's not for the want of options/choices. Dichotomies still remain because the citizenry is composed of people with wide range of political beliefs many of which are incompatible (this has always been the situation).

We shouldn't expect a consensus.