I would suggest a power point system for magic if you're using crystals, with the points working just like those of the psionic system. The crystals could work easier that way, so insted of containing spell levels, they just hold 16 points.