I definitely think your proposal is an improvement!

I'm sorry for my difficulty with "track", I've had a very hard time with reconciling my experience of infrastructure and the different categorizations I've seen in projects with the buckets of the wiki described tagging scheme, I'm hoping the separation proposal will help a lot with that.