I think the upper line is the correct one. For trendline, you should connect as many low together ( for uptrend ) as possible. The trendline should be drawn near to where the action is. You have chosen Oct 06 - May 07 which is fine but you should not go too far back because the action ( the recent bull ) is from Sep 06 onward. For downtrend, connect as many high together as possible.