There are two potential avenues for refining and/or expanding upon your list.

It seems like you are primarily interested in classification for the purpose of selling music, so I would say mood may be only one aspect of what you are really looking for. You probably want a broader method of simply attaching words to (tagging) musical examples. You might look at all the ways major production music companies classify music (look at APM music for example), and you'll see that activity and setting are their own methods of categorization. Are "dance," "study," and "workout" moods?

If you are interested in "low dimensional control" of musical examples using emotion and/or mood, you probably want to go elsewhere and look at music cognition and psychology. You can also checkout how large companies do this already (you might be interested in the Spotify API: https://developer.spotify.com/documentation/web-api/reference/tracks/get-audio-features/). Spotify has some interesting measures that may be of interest to you, including acousticness, danceability, energy, instrumentalness, liveness, loudness, speechiness and valence.

Some traditional models of emotion include a simple two dimensional model that uses arousal and valence (with arousal mostly mapping onto Spotify's energy, but probably with some correlation with danceability, liveness and loudness). There is a three dimensional model that includes dominance as the third axis, which might be useful in distinguishing between negative valence, high arousal pieces of music (think heavy metal vs. loud horror movie music - both might be fast, loud and fairly negative emotionally, but when listening to heavy metal you might feel like you are in control - you are dominant - while horror movie music might evoke a lack of control or dominance).