Well, I'm partial to Canon, so I'd look at the recently released G7. I look at all compacts from a underwater photography perspective, so I'd be very unhappy with canon dropping RAW support from it. Other than that, it looks like a very nice P&S. The flash hot shoe (with an attached flash) will improve your indoor shots incredibly. The IS is helpful, the zoom range is very practical, and it's got Canon's logical menus and nice speed.

I've currently got an Oly SP-350 for underwater photography, and it's damn near useless in raw mode, as it takes a good 8 to 10 secconds to write a raw file out to flash, and has no buffer at all.

Matthew