Its quite easy to solve the jack-of-all-mages thing going on now. Make better spells take up more spell slots, so the best fire magic spell takes up 4 slots for example. That way you cant use it with just 1 point in fire magic, you need to invest 3 skill points, and even then you only get to use that one skill because you have maxed your slots.
