Moving to full-frame world, need advice

I'm a current D7000 owner (since day it was released) and love it but have held off investing in good glass as I knew even then that I wanted to get into a FX camera.

I've shot with the Canon 20D, 40D, and 7D in the past but haven't loved any camera as much as my D7000.  That said, I am not opposed to going back to Canon, but I just seem more at home with the Nikon ergonomics.

The D600 seems to be the obvious choice here. However, I know the 6D is looming and I need help making a decision:

If you were buying a full-frame camera in 2012 and have no allegiance (or lenses) to Canon or Nikon, which system would step into?  Who has the best selection of affordable (>$1000), fast, wide zooms and primes?  The majority of my shooting will be portraits and landscapes.

Thanks very much.