Well, there are too possible options in your case.
1.) Learn to cut better. I can't help you here. I do not even know if it is a good option since dropping 20 pounds seems pretty good to me.
2.) Weigh less prior to the cut. Lets focus on this one since you wrote "gaining too much weight"
It is possible that you need to lose both fat and muscle in order to stay down a weight class. This may mean shifting/altering your weight room work.
You can certainly eat "less" of something. The issue is how is that going to work for your training. I am of the mind that it is ok to "suck" a bit in practice. I realize you want to never have an off day, but hard work is tiring and it is ok to be tired.
If you think adding more cabs are causing both your increased energy and your weight gain how realistic is it to cut back on them by half of what you "embraced". Short term goal of losing a few pounds from your walking around weight.
For this purpose lets set the parameters for energy loss at "I feel more tired deep into the training session, but I am still able to participate fully." Meaning, dragging by the end and feeling exhausted is fine. Having to dial back weightroom intensity is ok, may even help. Having to sit out times in training is not ok. Getting injured is not ok.
If you think cutting down carbs, especially not around workouts is degrading recovery can you swap them with other methods such as foam rolling, massage, stretching, etc.?
Does this sound workable?