You could also go for a clear cut distinction:

All Healing Spells are moved into role actions, and are abilities. The casted stuff is currently rather useless anyway, so just double down on fully oGCD healing. Then give all healers their own DPS rotation.