These are great tips. A good beginning for people is try to swim with you regular clothes on with your EDC. It isn't as easy as someone might think.
I have quick releasing body armor too in case I fall in water with it on. Make sure your backpacks are quick releasing, and use air tight bags inside the pack to separate your gear.
Those separate air tight bags will make the pack float. Then you can use the pack as a flotation device. I also recommend people keep a flotation device, with a rope already attached to it, in their vehicles for quick and safe water rescues.