Two populations are better than one: Short gamma-ray bursts from SGR giant flares and NS-NS mergers