destiny gives magic crit as well btw.
GM focus is 20% chance, and 30% damage.
But yeah, magic damage increase, and skill damage increase are additive.
I don't know the formula for magic, but heres my damage values:
Freemage:level 16
62 magic
2.2 base. Can tell this, by 2.2 fire, water...