I wouldn't bet too much on Canon and Nikon getting the ergonomics right looking at the mirrorless cameras they have had out so far. I know the Nikon cameras were quite small, and so limited in ergonomic options, but the Canon M series did not arrive looking that well designed imho, being just a rectangular box, a la Sony, but it has evolved. I think their system is limited by not having an EVF so far.
Ergonomics are a personal thing, and has been mentioned before, important for some, not for others. Some are willing to put up with poor ergonomics if they feel the the whole product has the features they want. Like I said, it's a personal thing.