I ended up switching to a pre.
Aside from the lack of adequate performance on my Hero (which probably would have been relieved by the Moment), I noticed my hero and my co-worker's moment didn't pull as good or consistent of a signal at my work than my other co-worker's pre. This was kind of a big deal to me.
I find myself really liking webOS, multitasking and overall performance. It's generally more pleasing to use (imo). And despite the diminutive number of apps available, the ones I would actually use are there (where, fandango, getmevino, trapster, translator, bubble level, etc...). The patches available from precentral/preware are pretty awesome too.
I think Android is a fine phone OS (I'm enjoying webOS more), but the hardware on the Hero is lacking and I needed better signal at work than either the Hero or Moment could provide. Perhaps Android 2.1 would have sped things up, but my 30 days were almost over and I doubt it would have improved the radios.