I think that it's not quite torture, actually. There are far far worse things than waterboarding that cause permanent damage, and calling this torture, to me, anyway seems to cast too wide a net on what it is. I think what 2 people total were waterboarded? and key information that saved lives was extracted? meh, if one has to resort to extremes, in very very rare specific cases. such as this. I can forgive. I still feel it is shy of torture, in the context it was used.
Now if a civillian police force used it, or even if the military decided it would be used on more than the most extreme cases, I'd probably change my mind.