Fat is the least anabolic macronutrient and the most likely macronutrient to wind up as fat on your body. I'd increase protein to 35% on workout days and 40% on rest days. I'd keep fat below 35% at all times. Carbohydrate is less likely to be stored as fat than fat by an order of magnitude. Fructose is also less likely to be stored as fat than glucose because it increases the metabolic rate tenfold over glucose as it is more difficult for the body to process and increases body temperature more. Immediately post-workout I go mostly for starch, but when sedentary I feel fruit is a superior carb source as it is a "slower carb" in general.
Of course, this all assumes kcals stay the same.
Don't put your trust in anyone on this forum, including me. You are the key to your own success.