How do you know you are getting enough calories without tracking them? Are you gaining weight? Also, what makes you think you're not getting enough protein?
Do yourself a favor and start tracking what you eat. Aim for 16-18 cal/lb and 1 g/lb of bodyweight for protein (in your case, 170g). Carbs and fat ratio can vary, but I've found that by simply setting fat intake to 20-25% (or 0.4-0.5 g/lb) of total calories and then simply filling the rest with carbs works well. Try that and if you have trouble reaching 170g of protein daily, consider a protein supplement but don't use it as your primary protein source. As far as which one is best, it's not going to really matter much. Not nearly as much as total protein intake anyway.
Once you've got everything set monitor your weight on a weekly basis. If weight isn't increasing by 0.5-1lb per week, adjust calories.