Good stuff here. Nice outline!
For the "when things get adventurous" section, there are three priorities:
First Priority: Take care of yourself. You are the most important thing until you are back in a boat, on a boat, or on shore. If you are not taken care of, someone may put themselves in jeopardy getting you that way.
Second Priority: Take care of other people. If you are safe, work to take care of other people. If in a boat, ask the captain how you can help. If there is no captain, then you probably just became one. If you can pull in others, do so. If a rope rescue is something you are able to do and you feel fairly certain it is the right thing to try, then try. Do NOT worry about gear until people are taken care of.
Third priority: This is a distant third. Take care of gear. Pickup what you can, get boats righted or to shore, etc. This does not happen while you have the option to take care of people.
I remind people that the first thing that should go through your mind when you hit the water is "I am having the time of my life!". We don't raft on lakes, we raft on moving water, and sometimes that means swimming. Swimming can be an adventure! A positive mindset goes a long way!