I agree with a lot of what you say here, but not that 2e rivaled 3e for options. It wasn't even close. Sure you had the Complete books and a few other books that provided kits and such, but that didn't even begin to touch the 66 full classes, 284 prestige classes and several hundred if not more than a thousand feats. 3e had 173 races. 2e had far less, but I can't find the exact number.
I don't know. I think it depends on HOW you define options. If you define it as narrowly defined classes and feats and races...then sure, 3.X blows 2e out of the water.
BUT, if you define it as open options...I think it becomes a LOT closer. This is because of 2.5 which had a book or two which opened up options (basically, build your own class) for players (though, technically the DMG did this already, it was even more open with Spells and Powers).
These were official rules, as opposed to 3e's more nebulous idea to take what you wanted...which really weren't rules at all. In that light, with 2e, in the latter part of it, you could basically have all the options from everything to do with as you want in your class creation/character creation.
I was NOT a fan of it personally, but...there you go.