Rereading all of this, would the "best case" scenario for fixing Commons categories be...

1. Easy redirection/multiple names for a given category
2. Easy/trivial renaming of categories
3. Sit us all down on a new project to rebuild the trees from the top down, doing it right?

- Joe