Im really glad I asked these questions before I spent over a $1000 bucks! I think the 17-55 f 2.8 lens might win! Thank you again everyone!!
If you do decide on the 17-55 f/2.8, you should know that this lens is notorious for dust getting into the front element. While consensus is that it won't affect your photos, I couldn't stand seeing it. I had mine cleaned twice by Canon (free if you're a CPS Gold/Platinum member) until I put filter on it. Since then, no dust. Get a high-quality, multi-coated, clear filter (UV isn't necessary for digital cameras). I only use B+W filters.
This B+W filter has a low enough profile such that you should not see any vignetting and has front threads for your lens cap: