Yes, I think waterboarding is torture, but so long as it provides information and is used on a combatant, I have no problem with it; nor, of course, when it is used for the purpose of training.
Regarding milder forms of discomfort, I don’t know. It is, I suppose, a matter of degree.
There may be hope for you yet...