The Uses category has indeed been a large catch all category that keeps getting larger and larger the more we put in. I'm all for moving these things around a bit and it wouldn't take much work to do.
I like your proposal above except for :
*Medical Uses:
Medicinal Herb
Having a category for one option probably isn't ideal. I wonder if Medicinal Herb can somehow be placed along with the edible features.