Canon Rebel T2i with a Sigma 18-250 lens and Panasonic TS3. However... I find the Rebel kind of bulky to carry and the TS3's photos of just average quality when not used in the water.
Plus, I do not tend to go back to my photos much. They just kind of sit on my hard drive.
Been trying to minimize my picture taking and restrict it to only the best/most important moments. Also been trying to focus on enjoying things rather than documenting having done something.