Fuji X20 or X100s

if you are up to it, get the x100s + a wide converter. although you can do the same with the x20 + wide converter which could give you a lot more headroom. annoying isn't it.

but if you want my opinion about this, I'd stick with the X20. the reason I didn't consider it is that I need a more specialized camera for lowlight which is not the X20. long exposure, ultrawide shots, family portraits, landscapes and with enough exposure, the X20 can't be beat with it's AF, deep DOF and zoom flexibility.