Nice approach, and well explained! By the way, Niland is a startup that also does music labeling with the help of deep learning.
Demo available here: http://demo.niland.io/
For example, it can output Drum Machine: 87%, House: 88%, Female Voice: 55%, Groovy: 93%