It appears you are trying to build muscle and become leaner at the same time. Unfortunately, this is just not possible.
In order to gain muscle mass, you must consume at least 500 calories in excess of your daily needs.
In order to become leaner, you need to consume 500 calories less than your daily requirements.
My suggestion is to bulk for 6 months and then cut for a couple of months so that you can see what progress you have made.
Unfortunately, it doesnt happen over night and you will need to bulk for at least a year to see any decent improvement.
With regards to your workouts, I suggest that you do Full Body workouts 3 times a week. This will incorporate 4 compound exercises and 2 isolation exercises.
The link below is a fantastic workout and I have been following this program for a consideable amount of time with great results.
http://www.t-nation.com/readArticle.do;jsessionid=0EC5971855E7727E1C7B2A84D784F9C6.hydra?id=508031
There are just a couple of things you need to remember...
Your diet is more important than your exercise.
You need to lift enough weight so that you are struggling to complete your last set of any exercise.
Also, ensure that you eat 6 proportional meals a day. Try not to take in too many carbs for your last two meals.
Last but not least, with regards to protein shakes. Have one an hour before your workout and then have another straight after your workout. It is adviable to mix approx 30g of glucose powder into your post workout shake.
I hope this helps....