I personally would drop Enlightenment, and let it go to Test of Faith and Body and Soul. Surge of Light doesn't seem to be a healing talent anymore.
It's a DPS talent that lets you occasionally get free Holy Novas (now raidwide?). Now I'm not sure how expensive Holy Nova is, or how likely we are to be using it, but picking up Surge of Light for that (not some DPS hybrid, that's a different story) would probably be better spent on either Holy Focus, or Improved Holy Nova.