I had a similar evaluation, and echo your observations about lenses. I use primes almost exclusively with the D800 to obtain the best image quality. I have found some real gems in my older AI-S lenses that are a joy to use and produce good results, something I didn't expect when I bought the D800. I upgraded my computer around the same time partially in anticipation of editing 36MP images. Now, almost a year later I truly have no regrets over my decision!