The camera upgrade is really the one thing that has be one the edge of upgrading my 7+ to an 8+, I'll still probably wait until next year's model.
I'm still considering getting a full-format mirrorless system someday, because even with as great as smartphone cameras are getting there's only so much you can do with an image sensor the size of a pea - but damned if they don't take good looking pictures regardless.