I am trying to decide on camera/lens purchase here

Currently I am looking at the 7d with either the 17-55mm 2.8 or the 24-105mm 4.0. My main issue with the 17-55 is build quality and I cannot use when I upgrade to 5D. Which I plan to buy the Mark II when the Mark III comes out (great price reduction)

Indoor shooting is really just family pictures/kids etc some portraits. Outdoor I shoot landscape, street, portraits etc.

Also,
just to mention, I can buy the 7D now at normal retail or I have the option to buy the 5D at cost +7%. Should I just get the 5D now?