I think you should consider a pantheon composed of gods/goddesses based upon human emotions/instincts (hatred, curiosity, hope, despair and so on). Gods are made up by the interactions of humanity dreams with raw magic flowing through the world. They passively grant divine powers or power for ritual arcane magic but are not sentient or active. In a different way, there should be a sort of constant emanation from the gods. This MIXED emanation coalesce into the usual medieval angelic/demonic bestiary BUT without the usual christian framework of objective good and evil. Demons and angels, being "conceptual" creatures, are diveded by philosophical schools (epicurean angels, stoic demons, cynical angels, skeptical demons, nihilist angles and so on).