I can't add anything to what should be carried, but your post comes just a week after an article in the local paper:
Rip current article

I thought it was interesting that they're trying to predict rip tides/currents using cameras on the surf. Pretty cool.
Jason