I have both the E-M5 (original) & E-M1. Unfortunately I don't have the 12-40 lens to go with it (I'm still using the 4/3's 14-54 II lens instead or else the M4/3's 12-50), but there are good deals around for the E-M1 & 12-40 kit with one place selling it for $1699 & I'm sure they aren't the only seller with a good price. While the E-M5 was a lovely camera you would find the E-M1 so much better with more direct controls, larger EVF etc, but more importantly is more responsive with a larger buffer. The benefit of WiFi & tethering with Olympus Capture might also be useful on occasions. The improved C-AF might also be useful to you as it has been proving to be quite effective with the latest firmware 3.0 now. To me it sounds like the 12-40 lens should cover most of your requirements by your description. For something a little longer, without going for the larger 40-150 Pro lens, there is always the very sharp 75mm prime.