This is what we just got, incase anyone needs additional future options..both are 12mp. Seems like you really have to read the booklets a few times on these to figure out all the stuff they can do..
Fuji S200EXR
Fuji XP10
I work for Fuji and we get a pretty decent discount.
I broke the glass on the XP in Ouray last week, supposed to be shock proof, I hope they replace it, it is water proof also.