This is my idea for magic, witchcraft being the ritualistic occult stuff is more or less performable by anyone with right knowledge. Some people have more of an aptitude for it but most people with the right training and materials can do it.

Then there is magic which is considered by most to purer than witchcraft. This requires that you be born with the ability and different mages will have different element based powers. Witchcraft is a little freer but it takes more time and training to use.

For angels I think I'd just go with the Supernatural style ones.