Out of the two I'd have to say Adidas. The Nike shopping analogy for their team is pretty spot on, and in comparison Adidas seems like a more exclusive team. Maybe less these days, but they're not buying half the industry, which is nice. I like their shoes better as well, and I don't really see as much gimmicky money grabs from them as I do Nike. Plus, The Gonz has a lot of say in what happens over there. Can't forget that.
I still try to support skater owned as much as I can, having only purchased a few pair of Adidas shoes and no Nikes. While I don't doubt there's some corporate sketchiness happening at Adidas, I hear far too much more about Nike to rest easily.