I have to agree, #2 is a prize winner.
here is a little hint on shooting whitewater. Increase the depth of field (high F-stop) and take a longer exposure. The water will be much more dramatic and more life like. A short exposure catches drops in mid-air and typically is not as well received by the viewing public.
A short exposure is what what point and shoots will catch, A long exposure is more often seen with an SLR in manual mode.
For example compare these two shots...
long exposure (f40 1/8sec)
short exposure (F11 1/400 sec)
I linked to the shots, instead of distracting from your beautiful shots by posting the examples.