I have been going to the gym for about 6 months now. Most of the time infrequently, but the last 2 months have been frequent. However, i had the idea i was overtraining. I was spending 2.5 hours in the gym doing all kinds of exercises. After reading this forum i decided to slash half of it and add some exercises. However, i do not want to risk overtraining again so i would like your opinion of the routine that i started doing to day.
First some personal info. I am 22 years old, 6.1 (185 cm) tall and i weigh 220 lbs (100 kg). My goal is to increase my lean muscle and decrease my body fat percentage. My current diet is low on carbs, high on protein and i try to stay around 2000, or lower, calories.

Now for the exercises:
Dumbbell shoulder press (3x8)
Hammer curl (3x8)
Bench press (5,5,5,3,3)
Squat (ass to grass) (5,5,5,3,3)
Heavy barbell rows (5,5,5,3,3)
Deadlift (5,5,5,3,3)
Preacher curl (3x8)

I wanted to add some dips (3x8) but that would take me over the 1 hour and 15 mins training time so i decided not to yet. Should i add them.

Thanks in advance for any sort of advice.