Hey, there, Tank! (grin)
Don’t worry too much about the macronutrient ratios. They take care of themselves. And the ratio of your macronutrients doesn’t have anything to do with whether you’re getting enough calories. The scale will tell you whether you’re getting enough calories. If a whole week goes by and you don’t gain any weight, increase calories by 250 calories per day. Have you ever seen JB’s Outcome Based Flow Chart? In other words, if you’ve been following your plan and didn’t get the results for which you hoped, you make an adjustment. But if you weren’t following your plan and didn’t achieve the results for which you hoped, instead you tighten up ancd do what you were supposed to do all along – get back to following your plan! Reassessments/reality checks are done once every two weeks. Use your scale weight and BF percentage to determine whether or not your’re taking in enough calories.
Don’t worry too much if you’re carb sensitive. Meet as much of your carb requirements as possible with green veggies and add in small amounts of starchier type carbs to help you meet the carb numbers you set for yourself. After your PWO drink, your two meals following your workout should be from starchy carb sources. You should take in the majority of your carbs PWO. This is when your body needs 'em most and is best/better able to process 'em.
You’re run all your other numbers and are getting 1.5g of protein x LBM and .4g - .5g of fat x LBM, right? With those requirements met, I’d raise and lower carbs to achieve your goal of increasing LBM and TBW.
Just remember, assess and readjust every two weeks.