I believe your point 2 was the way this "smart loot" was supposed to work. At least that's what most assumed based on Bungie's description in the pre-launch videos. Something similar to, "The game will take into account what you currently have equipped when deciding loot". I'm paraphrasing and going from memory. I'm going to go back and take a look at the vids.