I think that you have left out the Ayn Rand-type libertarians. Leaving aside her many flaws and psychiatric conditions, her libertarianism was all about the power and dignity of the individual versus the evil of the state.
Except she was a dedicated atheist.