Sell 20/1.7, buy 25/1.4?

I agree - if I'm only going to bring one lens I usually end up with the 20mm. It's small , light and looks in-suspicious so that the 'targets' doesn't feel intimidated. I also think the 40mm equiv FOV feels very natural.

The big disadvantage with it is of course the (relatively speaking) slow focus.