When you say, "roughly around 2100", it sets bells off in my head. That usually means that it's not an exact number because you've never really worked it out or been consistent.
Are you gaining weight on your current caloric intake?
If yes, how much and how fast?
Have you thought about doing a more abbreviated version of full-body training?
You could do fewer lifts in one day and it will allow you to put all your energy into them.