Ok, so I deployed the new cohort upload: https://metrics.wmflabs.org/cohorts/upload.  Hopefully the explanation and examples make a bit more sense.  And I think it's much cleaner this way.  It's also faster :)

As always, let me know if you have any trouble.