Your description of how you like Wizards, Warlocks and Sorcerers makes me think you would like the nWoD version Mage: the Awakening. There are five "Paths" of magic, which can be further modified by "Legacies." But, the initial paths are basically these: Enchanters, Warlocks, Theurgists, Necromancers and Shamans. Each of their paths of magic are differentiated by the form of supernal reality which they contact for their magic, e.g., enchanters with arcadia/the fae, warlocks with pandemonium/demons, etc.