I was considering waiting for the 5D4 before it was even announced but I ended up getting a true all rounder, the 1DX2. I know it's expensive for some budgets but it really is good at everything. Just have a look at the 1DX2 Owners thread and see some of the images people are churning out, megapixels really don't make an image better, and even if you're printing big they still don't matter unless they're going to be viewed from a foot away. If the 5D4 had come out earlier I probably would have got that instead, as that is sure to be a great all rounder and has good resolution for the pixel peepers, but I'm glad I got the new 1DX. For days out with the family etc I have my M3, soon to be updated, plus my excessive collection of film cameras. For anything where resolution or great dynamic range is required I have a 645Z.
With your needs I'd probably go for the 5D4 but of your budget allows then the new 1DX is great at everything and worth a look.