In that case, your option is the most suitable. Now, we need to rename some spells, change their icons, and, if possible, adjust the effects for some of them.
The only thing is, could you make it so that the skill granting protection is in the Earth magic, but it can be upgraded by having both Earth and Air skills.