Ok. roughly have an idea what to get.
LX5 and S95 are good (choose the LX5 if you are okay that it's a bit less pocketable, otherwise go for S95).
If lots of budget, can consider the Sony NEX with the pancake lens or waiting the upcoming Fuji X100 rangefinder. Both have APS-C size sensors.
I am also inclined towards LX5