This is a great post, it certainly does get a bit muddy in these territories!
It seems that in these realms we largely follow our intuition - relying on whatever structure we have access to, or whatever structure works. I feel a connection to both the witch and magician as you've described them. Probably more the magician - with its emphasis on transcending our bounds, and examining the power of naming life in particular ways.