Dubstep got itself a bad reputation and even though you specifically said no dubstep I'm still going to recommend coki, skream, and horsepower. (dubstep originated from dub so early dubstep is very similar)
As for psytrance, kaminanda, merkaba, and koan (not the dubstep group with the same name).
As for dub, I haven't found a lot except for the usual mad prof, but al cicernos (vocalist of OM) does some stuff.
I had an edm thread a while back with good stuff. Other than that I'm not crazy about the genre anymore.
Also there's a great site for intelligent/indie edm, I'll look around for the name.