I ended up with the Tenba BYOB 7. It is just about big enough to carry the M6, 15-45mm and 18-150mm lens, plus EVF, spare battery, etc. The whole thing fits inside my business backpack when travelling for work (which I do a lot).
The downside is that it is not really suitable as a bag to carry...