If same money, X-E1 vs X100S?

I had the xe1 and returned it, then sold my X100 and patiently waiting for x100s. The x100 form is just absolutely best for my needs as a travel camera.

The xe1 with the zoom lens is a step back towards dslr in size = something I wanted to ged rid off in first place. And the 35mm lens is too long for travel, the 18mm is better, but its price doesn't match its quality. Frankly the x100 is EXACTLY what I wanted sans the lackluster AF speed which the S supposedly should fix - we will see about that.