I am also in the market for a "good" camera. I like the idea of the Nikon D3100/5100 because the underwater casings are reasonable at $1200...
I do a lot of diving as opposed to snorkling so can't get away with the little "waterproof" compacts. Trouble is I don't know that I will ever trust taking an expensive camera underwater.