Looking for an Episode

I know this is the Psych "Fic Finders" community, but I'm at a loss of where else to turn. Mods:  f you must drop this post, I'll understand. I just figured that everyone here is always so helpful that this was the best place to start.

I am looking for an episode (possibly episodes) where Henry confronts Shawn about his lack of discipline (and the word discipline is used).

I am aware of one instance - in "Dead Man's Curveball", Henry tells Shawn he "has no discipline, even in sports".

I am pretty sure the episode I'm looking for happened in an earlier season, but I'll be grateful for any references.

I can tie this post to a fic in one way - I need this reference because it will be a large factor in a Psych Fic I am currently working on!  :D

Thanks!