Too late Charlie, I've bought the 6D and yep, although I've only used in in the living room tonight so far, I'm pretty pleased so far. User controls aren't much of a change from my old 450D, the 50mm is just perfect, the extra bits like 9 shot bracketing are promising, the GPS & Wifi ? Well so far, I'm not seeing much value in them.
As for investing in EF-S, so far, I'm looking at selling my 10-22 & 15-85 for about 80% of what I paid for them, for the use I've had, I don't see it as an unwise investment and fully recommend both lenses to anyone stepping up from kit lenses. Yep, the 70-300mm isn't used much, I thought I'd need it when I set out on my DSLR journey, but generally prefer wide and portrait lengths.
What do I want now ? I've got a few ideas, but ain't going to go rushing in, a 24m prime would be nice, perhaps the 24-70mm f4 when it comes out (near macro and sharpness), also fancy a 8-15mm in time... That's my next few years mapped out, but might see what comes up on the second hand pages of my local camera shop, grab a bargain ;-)