Go to Mexico in May and get
the Canon D10.
Not useful, I know.
I hate to say it, but I'd actually advocate getting a disposable waterproof camera this round, and wait. This is the year that everybody's releasing a waterproof/shockproof model into their P&S lineups, and there's actual competition going so that you aren't locked into looking at just the Olympus models. Keep an eye on dpreview. So far, Canon and
Fuji have both announced waterproof P&Ses, and between now and PMA there are likely to be one or two more.