As for your routine, there are others here far more knowledgeable than I, but I would suggest focusing on compound movements (e.g., bench, squat, deadlift, chin ups/pull ups, etc) over isolation exercises. I've found that works really well for myself. Perhaps someone else can give you more detailed advice.
Yep, compound is the way to go - provided you are able to train with good form.
I've never really been a believer in isolation exercises ( funny because I'm a bodybuilder and we're known for using 'shaping' exercises!) I think using exercises that are going to stimulate the muscle fibres under the heaviest load in good form are always going to be more effective than using a machine or isolation movement. I'm sure people will disagree with me but I think our muscles are going to grow in a certain way no matter how many 'shaping' exercises people might use to try to enhance their bicep peak or build more quad sweep. Just use simple exercises that target as many muscle fibres as possible and train yourself to be as strong as you can in them, you'll grow a lot quicker that way.