for me i'd go for xe2 and xf 18mm..

if too wide,u can just crop and 10MP is sufficient .at least for me ..i own xe1 and xf18.and i've been thinking to try x100s.

yet i try to crop the 18mm and become around 23mm in focal length..it is like having x100 (12MP on resolution) .so decided to stay with xf 18