I would say drop the weight gainer. Most of them are just full of crap that you don't need. Switch the weight gainer for a good protein powder, it will help you recover from your workouts without adding fat. A lot of people swear by Ultimate Nutrition, including me. Only you can know if your diet is truly in order. If you want post it, so others can review it and make suggestions.