With regard to 2.b.)
Rand, however, also condemned voluntary communal activities, depending on individual participants' motivations.
E.g. on charity:
"To view the question in its proper perspective, one must begin by rejecting altruism’s terms and all of its ugly emotional aftertaste—then take a fresh look at human relationships. It is morally proper to accept help, when it is offered, not as a moral duty, but as an act of good will and generosity, when the giver can afford it (i.e., when it does not involve self-sacrifice on his part), and when it is offered in response to the receiver’s virtues, not in response to his flaws, weaknesses or moral failures, and not on the ground of his need as such."
If it were truly merely a matter of voluntary choice, there would be no moral blame on me if I chose to help someone, regardless of my motivations as such. If I were giving handouts out of the apparently perverse reason that someone needs it, Rand would condemn that; in contrast, a libertarian emphasis on choice would mean it's as valid as any other motivation, so long as it's non-coercive. (In the same line of argument, she would condemn me for advocating communitarian policies, because speech, even though it's inherently non-coercive, can be morally stained.)
Overall, though, I like the concepts you're pushing for in 2, though I don't think Ayn Rand would have embraced them. You're looking for someone closer to Elinor Ostrom, who is much less inflammatory and not at all focused on moral questions but also much more thoughtful and interesting.