First off, the 5D2 might be as good or better for less money; we don't know.
... but the 6d will most probably have less banding than the 5d2, and Chuck Westfall predicted that the 6d has even better high iso than the 5d3. I think both is very probable, or Canon wouldn't get away with the 11pt af system.
For my type of photography, I enjoy doing landscapes, macro (although I use an extension tube for budget reasons), portraits (still subjects mostly... and my pet dogs!), and general travel photography.
I'd be very surprised if the 6d af wouldn't do for that, esp. if you are even somewhat ok with the mediocre tracking of the 60d. The 6d will have larger af points and better low-light capability, but for macro this probably means more inconsistent af than with the smaller points of the 5d3: for difficult spots like the small eye of an animal that is looking towards the camera, my 60d often doesn't hit the exact spot I want it to simply the af point is so large.