The Ricoh WG series cameras are nice and affordable..
I bought the Ricoh WG-20 couple years ago to take on a vacation where we did a lot of snorkeling.. the camera worked flawlessly Its a rugged little camera and can go to depths of 10 meters(33 feet)I was able to get some awesome shots of the coral reef and several sea turtles.. Worth looking into..
I admit I am partial to Pentax but something to consider when changing platforms..
Pentax has in body image stabilization, Canon and Nikon do not.. If you want image stabilization you must buy it in the lens
which makes the lens more costly.. Pentax K3 with the in body stabilization allows you to use your *ist DL lens plus any old K mount manual lens.. I have a Pentax K200D and a Pentax K50 and I enjoy using my old Pentax film cameras manual lens
My K50s autofocus is fast.. Seems faster than my K200D.