i have almost the same comp (druid instead of lock) and i can confirm that the priest is much better as Discipline (at least for me)
you can find my thoughts on this topic here: http://www.dual-boxing.com/showthread.php?t=31689

enjoy the levelling to 80 :-)