In reply to 3414peterk:
I've just had a similar dilemma, and gone for the 6d. Going from a 20d it's a hell of an improvment. The better handling of noise at high ISOs is incredible, and the sensitivity of the central focus point is close to unbelievable -- it focus-locks on stars for goodness sake.
Either will be good though!