I think merging vocals and instruments could be useful, since we already have “instruments” that are the body of the player, and there are edge cases that could be classified as a either an instrument or a vocal (such as beatboxing). Then again, if we go with @dukeja’s suggestion, we’ll still have that problem (though it’s still a good suggestion).
Not really a useful comment of mine, I know, just some random thoughts. 