I would just change the role of affinity. Instead of affecting learn rate I would make it affect casting level. I would also change shield from immunity to 10% per affinity point(but not touch the general dam redux). So a 10 affinity makes you immune 0, does not.

If there were a ton then everyone would be immune to everyone in the current system. They are similar to conjurer in that they basically neutralize each other.