Thanks to everyone for their advice. It came down to smaller waterproof (Nikon AW 110/Fuji XP60/Olympus TG 830, etc.) or a bigger, more DSLR-like camera (Canon/Nikon/Fuji). The bigger camera won. Fuji S8200. It has all the features I wanted, and my current Fuji is the best camera I've ever owned. The S8200 has 40X zoom, 1080p @ 60 fps video, an electronic viewfinder as well as an LCD screen, and it uses AA batteries.
The smaller waterproof cameras are just too small for me. I'm used to a medium sized camera with a good sized grip. The Canon G15 doesn't have 1080p or 720p @ 60fps that works best for whitewater video, and the G16 is too pricey ($499). The medium sized Nikons I looked at all were lacking some feature I wanted or were out of my price range.
So it's the Fuji. $200 from B&H photo with free shipping. I'll post up a review once I get it and can play with it for awhile.
"We are all visitors to this time, this place. We are just passing through. Our purpose here is to observe, to learn, to grow, to love....and then we return home."
Australian Aboriginal Proverb