I wish they would just take the spells as they are originally. When I use chromatic orb against an enemy that is engaged in melee with one of my allies, I am basically forced to use the thunder version, unless I want to hit both the enemy AND my ally with the surface. This is very frustrating to me.