Is the EM-1 still a good choice? Or better waiting for an update?

fratzi --

You are right about these optics: they are stunning. But acquiring these two lenses -- without internal stabe -- is more-or-less a commitment to Oly.  I have the 12-40 (and resisted the 40-150 so far . . .) and it is certainly the finest mid-zoom that i've ever used, going back four+ decades.  i absolutely love that lens.  So i'm hooked on Oly as my small form factor kit for the foreseeable future.

The Fuji and Sony systems are something of a different choice.  Actually the system choice decision is the big one.  Of the two Fuji would attract me more: their lenses are (almost) uniformly excellent but you are locked into one vendor.  The bodies are quirky (well, they are across the mirror-less world), but seem to be quite photographer-centric.  Fuji also gets bonus points for a coherent lens map . . .  that they follow!  What a concept.

Oh Sony, Sony, Sony.   Stunning bodies for sure.  Gawd knows that they know their way around sensor design; their latest BSI 42meg FF chip is a stunner (with no less than 399 on-chip PDAF sensors!)  But, really, what is their camera and lens strategy?  APSC?  semi-mirrored SLRs?  Full Frame?  E mount?  A mount? As a consumer i just don't see that they are dedicated to any single path.  i've lost count of their zig-zags since acquiring Minolta.

Forgive me Sony fans.

i chose first Panny m4/3 (due to cost on close-out bodies) and now Oly.  I am thrilled with the richness of the m4/3 lens and body choices and reasobably confident going forward that they will continue.  Fuji would make me happy too (though at somewhat higher prices).  Good luck.