Yup - it's that conflict that gives him a chance to shine. About the only major criticism I have of the series as a whole is that generally the characters are too easily identifiable as good or bad and never seem tempted to do anything that conflicts with that. The scene in the cafe where Ron is tempted to kill someone stands out because it's about the only time a Good character is tempted to do something really Bad. I would find things a lot more credible if Harry at least had a few more inner demons to fight.

The whole "which side is Snape on" thing was great, though, and I love this sort of thing - where motivations remain a mystery for ages.