If you're gaining weight at your current calorie intake then you're doing fine. If not, you'll need to add some carbs and fat. Also, your programming seems a little odd based on what you report. Have you done your novice progression unmolested? If no, I would do that.