The system is fine as is. Except that there is no additional cost for AoE. That makes mages excessively powerful. There needs to be an increased MP cost and/or casting time for Area spells. Cooldown time as mentioned earlier would be a bad idea.

I didn't realize only DoM got the toggle... but that needs to stay the same.