I think some of the definitions are a bit narrow. 12 months ago I would have lumped Goa, Psy, EDM and Dubstep into the same basket. Think of Rock for example, it encompasses a really wide variety of styles.
I’m giving Army of Mushrooms a listen. I like it, definitely dubstep.