I was speaking to your first point, namely:
> Sometimes individuals must break the law for greater good. This is called civil disobedience, or civil resistance.
Which is not a complete description of civil disobedience. It is accurate, but not precise.
Civil disobedience implies the actor wishes the law to be changed. They might expect not just a pardon for themselves, but a pardon for everyone who broke the unjust law. It's a distinction with a difference.
We agree that its effectiveness depends on accepting the punishment, sure.