I think we must go beyond the limitations of the meaning of religion and go into what all the components that form our beliefs. I say this because many people are not religious and yet have moral structures that determine for them what is right and wrong even though they are not socially acceptable, or at least not accepted by the majority.
My personal opinion in this is that all of that amounts to something that is not the same as "spirituality". For that reason I think religion beliefs are a different animal altogether. We had religious beliefs in the family and we also had a certain level of spirituality that's was allowed to us. We could only get a certain type of prophecies, for example. If leadership had already received a "revelation" concerning you, there was no way God would speak to a lowly brother or sister on that issue. The examples of spirituality abound.
Likewise, "religion" has similar examples as you have mentioned but I think it includes areas that do not mention or are related to a god. Look at politicians and other social engineers who think they have "the solution" or "the way" and look at them preach away on those beliefs. They also have codes or conduct as moral that rule their behavior. The same person who was spearheading an attack on the morality of President Clinton turned out to have been involved in some scandals himself even to the point of divorcing his hospitalized wife to go for a younger woman. I am sure he was following a code of conduct considered "correct" byt some people of his poolitical persuation. It is safe to say that they had the same "religion".
So I don't see anything wrong with spirituality but I see a whole lot wrong with religion. What do you think?