You need to be doing workouts focusing on compound exercises (which you have mentioned). Weight gaining shakes are OK, but most of your calories should be coming from "real" food.
By the way, I'd stick with whey protein, creatine and a multivitamin as far as supplements go. GNC stuff is overpriced and I think that stuff they sold you won't make much difference.