For the last few years my hiking and backpacking camera has been a Canon S95, which has served me pretty well. I recently noticed, however, several spots that keep showing up at the same places on my photographs. Cleaning the lens didn't help, and my local camera shop said it was probably dust or dirt that had worked its way into the camera and settled on the sensor. I tried a suggestion I read in another forum to try a shop vac while cycling the zoom, to no avail. Canon estimated it would be $150 to disassemble the camera and clean the sensor. (Moral of the story,–Just because a camera will fit in a pocket doesn't mean it is a good place to keep one! At least not without a ziplock.)
I'm torn between keeping the S95 and getting it cleaned, or moving up to something new. While I like the camera, there are some areas it falls short in. My attempts at night photography really show the limitations of the small sensor. I'd also like a little better macro mode, and the ability to produce some high quality prints to give as Christmas presents.
I'm intrigued with the Ricoh GR, and have also looked at the Fujifilm X20. I've also thought of a system camera, even the Canon SL1 DSLR.
What are some suggestions? The lighter the better, but I want to be able access modes, etc. I don't mind a fixed focal length. A viewfinder would be nice but not a necessity.

