Replace metrics with straight aggregates

[dajinchu]

Remove metrics that combine multiple responses, and only include basic 1-response aggregates

[dajinchu]

Hopefully by more directly representing what is already in the TRACE system, we are less objectionable