Thanks for all your input! I got my D600 now and have decided to go with a pure prime setup 28 f1.8, 50 f1.4, 85 f1.8 skipping the zooms all together in this range, I never was fond of normal zooms anyway. I love fast glass and being able to use shallow depth of field. I also want to use good quality glass now when I switch to fullframe.
For the wideangle I also have the Tokina 10-17 fisheye. Sure not the sharpest of lenses but it works surprisingly well in FX and covers the full frame at 17 mm and thus gives me an option when I need to go wider.
As my last lens I am thinking about updating my Sigma 70-200 HSM macro to the OS version. On these long and heavy lenses OS/VR could really be handy.