I would look into the 35 f/2. It's definitely an often overlooked lens. On a crop it is great and sharp. I have never had focusing issues (very fast focus at this focal range), and the sound of the focus motor does not affect the image quality!
I have a bunch of lenses, and the 35 f/2 always ends up on my 7D.