Stringsinger, your categorization system is obviously entirely different from Levitin's; I'm sure he's got protest and topical songs under one of his big categories (like knowledge).
Your second list is a mish-mosh of approaches toward categorization, and more about where or when or who the songs come from than what they're about.