It's a tough call.

I'm exploring all options and am also looking at the Fujifilm X100.

It takes great pics, although, it's a fixed (no zoom) lens and macro is 10 cm.

Good review: http://zackarias.com/for-photographers/gear-gadgets/fuji-x100-review/

http://forums.dpreview.com/forums/readflat.asp?forum=1020&thread=40662554