Agreed with you on "modern liberalism" devolving into totalitarianism. "Classical liberalism" doesn't allow for that though. In practice, I don't think anyone in the US follows the latter strictly enough for prevent the same decay anyway though.
You might find "Why Liberalism Failed" by Patrick Deneen interesting if you haven't read it already. He argues that modern liberalism is the inevitable successor to classical liberalism.