Ok, I think I have it down to the best of both worlds now. The mana/regen of disc and the crit/spell bonus from holy. I'll probably be respeccing to this tonight. I'll have to see how well I like it during our raid on Sunday.

Here's what I figured and why I picked it.
--
Discipline Talents - 26 point(s)
# Wand Specialization - rank 5/5Wands rock, what can I say? During those times when you don't really need to be healing why not help with the DPS?

It's also nice to throw in a wand or two while you're waiting for cooldowns in pvp (or that one last shot to kill a runner).
# Improved Power Word: Fortitude - rank 2/2No explanation needed!
# Improved Power Word: Shield - rank 3/3No explanation needed!
# Martyrdom - rank 1/2I put this point here to use up a point to get to the lower talent ranks (since tier 3 only has 4 points). If you do end up getting hit it's nice to have a hard-to-interrupt cast.
# Inner Focus - rank 1/1This is great for both times when you run out of mana and someone needs a quick heal, or when you're on the off healset and regen'ing mana. If you're on the off healset you can cast this and you'll have a "free" cast that won't trigger the 5 second rule so your mana will still regen at the max rate.
# Meditation - rank 3/3Boss fights are all about the mana regen.
# Improved Inner Fire - rank 3/3This is more for pvp than anything. The inner fire buff in 1.10 is really nice and this just makes it better. If you ever draw adds from a tank or have the possibility of taking a cleave, just throw this on. It's nice for the Buru fight when he's chasing you, for example.
# Improved Mana Burn - rank 2/2Good for pvp and now with the "mana mobs" like Moam in AQ20/40 you can drain mana faster (AND deal damage!)
# Mental Strength - rank 5/5Mana is always a good thing. I picked this up from my last build and dropped spell warding from the holy tree. I figured I'd rather have extra mana during a fight than damage reduction. If I need any damage reduced I can either wear resist gear or heal myself with the extra mana!
# Divine Spirit - rank 1/1DS rules, like I said before boss fights are all about mana regen... and 40 spirit?
# Blessed Recovery - rank 3/3This is mostly for pvp or the "uh oh" case where you draw aggro. If you can regen 25% of what you were hit for you can stay up and heal longer (or have time to heal yourself).
# Holy Reach - rank 2/2This lets you stay farther out of range of aoe's or anything else of the like. Helps with runners in pvp, too.
# Searing Light - rank 2/2This is all about the pvp. More damage = faster kills = you living.
# Spiritual Guidance - rank 5/5This helps in both pvp and healing. If you have 327 spirit this is an extra 82 damage or healing.
Reasons why I didn't get stuff:
Lightwell - If you're looking to be solely a raid healer this could help, it would be a nice crutch in case someone has just bandaged and needs a heal but the healers a busy. If you're looking to do pvp, though, it's just not worth losing the extra talents on the disc side.
Power Infusion - Personally, I would rather have the dmg buffs from holy for some even, spread out damage than some burst damage every so often. Sure, it's great that you can give it to other group members, but if they're doing their job they should have enough +dmg that it won't be needed. It's also not worth sacrificing the constant +healing you get in the holy tree.
Other random stuff - There are some -mana cost talents I left out, but in order to get some extra mana and regen in the disc tree I decided it was better to get that than the -mana cost.
Keep in mind I haven't had a chance to actually play this build yet, but from what I've seen from the talents I have and what I missed from my old build I think this one should suit me well.