I went from the D7000 to a D800 and haven't looked back. I got back the controls I missed from my D300s ,as well as amazing dynamic range and sharpness.
As far as macro, I do miss the smaller housing and using the 60 + diopter, but really using the 105 + diopter has been great, better than on the D7000 for sure. On the D800 as long as you get the subject inthe frame you can crop an image out of it, the files are so large... ;-). Not quite the same on the D610, but still impresive. And the sharpness is really incredible.
BTW, the D610 and D600 seem to be interchangeable in housings, so if you want to upgrade later you can.