Even the question bothers me. It assumes there are only two types of EDM and that is just completely ridiculous. It ignores dozens of different varieties of music.
To answer the question, though, dubstep – as broadly used – includes everything from Skrillex, Omnitica, Bassnectar and Knife Party to Swedish House Mafia, Steve Aoki, Zomboy and Dannic. It’s a term that has become relatively useless. It’s the Kleenex of EDM. Techno actually suffered the same problem, so it’s really like asking whether Kleenex was better in the 2000s or the 1990s.