That sucks. I was already to buy an UWA, but now the 6D is out and the 5D2 prices are pretty low too, so I am holding off for now. I still have my 17-50, 30 and 60 and kit lenses though, but I will keep both of the crops.
I would have loved to keep my 7D (which reminds me, I have to change my signature!), but the wife found out how much the 5D cost and, well...you know how it goes. I'm literally just getting started in terms of going out and doing some jobs for pay, so she'll gradually calm down once I give her some money.
As for wide lenses now, all I've got is the 17-40. I'm thinking of selling that and my 70-200mm f/4 L (non-IS) and getting a 16-35L down the line, but, for now, the 17-40 makes for a good landscape lens.