Definitely option 2. I like encounters which feel coherent. If the party encounter a drow patrol, it's likely to include a couple of soldiers, an priestess or wizard, and some sort of sneakt scout type - pretty much like an adventuring party. While you can do that in 3.5, it's quite a lot of...