Why don't you consider the D500?
I upgraded from a D300 to the D800 when it first came out.
You don't mention what lenses you are currently using. I do miss my Tokina 10-17mm even though I've been using a Sigma 15mm and Nikon 16-35mm.
From everything I've read the D500 looks to be a winner.