Yeah, I agree. I don’t know which software you use, but the better ones are able to filter by lens / focal length so that you’ll get an overview in an instant.
The argument kind of goes both ways. I prefer longer focal lengths for portraiture. With the 25mm I can crop and get near that 85mm equiv. focal length. This is impractical with the 17mm, as the loss in image quality would be too huge for the sensor size.

