Pete,

One thing that we are mandating on all our teams going forwards for distance races is an inflatable diving tube. Its basically a bright neon orange 6 foot tall tube that you inflate when you drop in the drink. It sticks up in the air so you can easily be seen.