Having said all of that, one should not hesitate to use all available aperture settings unless critical resolution cannot be sacrificed. Aperture settings are a photographic tool to optimize image composition, and should be used as such. Diffraction concerns are secondary. As you explained, apertures are chosen depending on subject matter not to minimize diffraction.
There is nothing worse than a sharp picture of a fuzzy concept!