Conviction governs the amount of power you can throw around. Harry has a lot of this.
Discipline governs the amount of control you have over that power. Harry... is a little sloppy in this department. That's why he favors Thaumaturgy if he can do it: because it's slower and more deliberate, his lack of control doesn't bite him on the butt so much.