Have you seen the deal on B&H, where you can get a 50D body for around $930, and due to a current promo from Canon you also get a $500 off of Canon Pro9500 Mark II printer? This is a great deal if, by any chance, you also need a printer.
By the way, I am completely in your shoes as well. I have a delayed Christmas gift coming from my wife - as soon as I decide which camera I want. I do like 5D Mk II, but since 7D came out, I consider that as a top pick. However, the B&H deal on 50D is really great (in case you also need a printer).
As far as the lenses go, I would love to go with an L-class glass, but due to a crop factor things are a bit more tricky. The 24-105L lens is great on a FF body, but it really gets too wide for me when used with 7D. And the 16-35 doesn't offer IS - even though it is pretty pricey. The 17-55 is considered to be a great non L series lens. This would be my number one pick for 7D. The only thing is that it doesn't offer the environmental sealing of an L series lens.
Decisions, decisions....
Please keep us informed as to what you decide on doing.