I am getting the X-E1 (and owned both the 5N and NEX-7), simply for the user interface which to me is a bigger factor in getting the images I want (rather than small differences in IQ). I had the X-100, too, and the JPEGs are really as good as folk claim, but the AF, fixed lens (and not my preferred length) and the hybrid finder meant that it did not really 'grab' me.
I will mate the 30/1.4 to the X-E1; this will not be as portable as the GX1 plus 20/1.7, but the built-in EVF will mean that I can carry it in a small bag with the lens off if needs be. The X-E1 is the first recent camera that has really excited me, I have to admit.