Semantically I would say there is too much overlap between the two words to make a strong statement wither way. Conceptually there are four or five different concepts being batted about.

1 -- the individual as a non-material being seperate from the body but operating or occupying it

2--the individual as Infinite spirituality

3--some sense of an infinity which comprises all souls sort of merging into a composite of souls

4--some sense of an Infinite Spirit which is outside the individual self, an external deity

5--a sense of All in which all beings become One without individuality

My personal sense it that truly differentiating between these requires a strong spiritual clarity beyond that usually encountered amongst us Terran types today; but inventing arbitrary assertions about such things is easy and well within the capabilities of the most warped of us.

A