I think you’re mostly getting my idea. I think it’s also worth mentioning that in many ways, classical liberals like say Locke and Jefferson, were in their own ways, skeptical of libertarianism (even though they didn’t have a word for it) as a standalone ideological orientation, hence the fact they were social contract theorists — which by definition is trying to mediate individual rights against some conception of the common good. 

I’d go further and suggest that the emergence of state capacity libertarian and liberal nationalist thought are both re-evaluations of these insights by a bunch of former libertarianism and neoliberals who have recognized this very danger and are now trying to cope with it, in a contemporaneous conversation.