I debated sending this lens (the 20-40 Limited) back and picking up the 31, but the way I look at it I have a "31" with the 20-40, and it is nice to be able to frame the shot on camera without having to go back and crop in PP.
The more I use the 20-40, the more I like it. I've been very impressed by the colors, sharpness, the bokeh--which is excellent--and the overall rendering. And maybe I'm the only one who thinks this way, but I love the little lens hood. It's very tasteful even if it doesn't shade the front element the way a longer hood would.
That said, I couldn't get the 21 out of my mind. So I just ordered it. I've seen many excellent photos with this little lens and I'm confident it will do what I need. The size is a tremendous advantage as far as I'm concerned. I don't care about a lens being water-resistant, but I do value being able to stand in crowds and take photos without drawing too much attention. I believe the 21 will be a top-notch lens for street photography.
Thank you for your comments and photos (and LBA encouragement)!