..when i was a young psychology student, it was lucky to even get to write an essay on Jung, it was all about cognitive flow charts..and the DSM (III back then) kind of categorisations and diagnosis..

but i discovered in the library the pioneering work of Stan Grof, who was a bridge between between paradigms..a pity most psychiatrists don't go there, in terms of trying to understand or map these states of experience ..he of course went on to found the Spiritual Emergency network..but yes the time is ripe for a reformation of psychology's palettes and tools, as born out by more recent research being allowed in the institutions..

i'd add that one of the things that got me interested in the more intellectual philosophies of ancient Indian Vedanta, was it's effort to observe the mind, and more importantly the 'self'..it was a kind of psychology 2000 years ago, which in no way separated itself from the spiritual or the logical..