As for whether waterboarding is torture under US law: the US executed a few Kempaitai (Japanese secret police) agents for torturing US prisoners in WWII; they had waterboarded them. Waterboarding is also covered under UNCAT.
(Note to anyone assuming a partisan motivation: I am a serious Catholic, thus not by any stretch of the imagination a US liberal.)
There are several "Geneva Conventions". The US has signed some of them.
In general, the Geneva conventions only apply when both parties are signatories. Since the Taliban and such orgs aren't signatories ....
And the conventions quite definitely do apply to some degree when a signatory fights an opponent that is not a nation (and which therefore, by definition, cannot be a signatory). The details are a bit difficult, especially when a conflict is both internations and involves non-nation parties, but it's definitely not correct to say "our opponents are not signatories, so all rules are off".
I thought of another good argument against waterboarding: the Geneva Convention. My understanding is that it is banned by it under all (or, well, proscribed) circumstances, and the US is signatory to it. I think part of the reason why the US wanted to do certain things NOT on mainland US soil was to be able to weasel around certain laws and international rules that address what they are and are not allowed to do.