I would go for the EVF and in fact I would hope that they make a far better EVF than the current one... one that facilitate Manual focus drastically...
when i am using the x pro 1 or m240... there is still a sense of need to check the image under difficult lighting conditions... but when i am using EVF... i can just shoot... there is no need for further editing... The EVF show me the final result i want... and by having a better control of the EV settings... (current X-t1 is like very clumsy process for me, i shoot with auto iso, auto speed and only control the EV for lighting conditions and manual aperture).. as a photographer, we should concentrate on the image... as we had already selected a very fine tool to make it...