Yes, these are the same, and the being in question is distinct from the higher self or the individuality. The short form is that your current personality or ego is a reflection in this incarnation of your individuality, the self that remains from life to life. The individuality, in effect, falls asleep and dreams, and its dream is an incarnation. Watching over it and guiding it is the higher genius or guardian angel, which is a spiritual being who has taken on the task of guiding you from life to life.

That does sound like Socrates in the Symposium!