Self-defense and capital punishment are two different -- though related -- issues. You are correct that the Church acknowledges the right of the state to use whatever means are needed to protect society from dangerous people, but the Church also reiterates in the strongest terms that if less than lethal means are available they must be used.

In any event, we are pretty much on the same page. Peace.