follow-on to #2657

this should ensure the ability to do normal runs for most experiments, and discrete metrics for selective reruns, and to add/modify the metrics in an experiment without having to do a full rerun

need to account for possibly having metric values in the grouped table as well as a discrete metric table and reconciling which one should take precedence

┆Issue is synchronized with this Jira Task