The most subjective aspect of drawing trendlines is determining where the trend is. I agree with cnms2's analysis since we're looking for shorter term trends. The lines you drew, matt, were for a higher time frame trend.
Remember that the Hershey time frame is where you're looking for a trade duration of a week or less.