One thing I would add to the list of gear is a snorkel. I have one attached to my jacket.
Anyone that spends time bobbing about in the Channel whilst scuba diving will know that in a bit of chop it can be hard to breath without taking on water. Divers use their regs or a snorkel when on the surface for that reason.