Why not just remove the timers on Astral Fire and Umbral Ice? Timer's on any ability aren't fun anyway.