You'll never get an underwater P&S camera with high optical zoom. Gotta remember that the lens needs to stay inside the housing and this really limits the zoom. The odds are you aren't going to be taking a lot of ISO 1600 pics, so the Lumix would be the choice for me.
I just destroyed another Canon SD1400 due to water.(My third) I won't be buying another one, lol!!!