That was my plan too (to wait) but I was not patient enough. Purchased mine last March and I am loving it. If the 6d2 is concrete for release next year, I would wait. I haven't been reading about its rumored specs but I have a feeling that it would have more af points than 6d original. If that happened, I would definitely add it to my gears.
Well, me being like a kid at Christmas, I couldn't wait either. I just pulled the trigger on the 6D with 24-105 f/4L lens for $1799 at Adorama. Just couldn't pass up that price. Best I've seen.