4k calories is a good start and given that you've gained 40 lb, it's probably sufficient but you'll need more when those loads get up there. Where are you measuring your waist?
Let's get some eyes on your lifts as well. Technique is critical here and it sounds like there may be some room to improve there as is often the case.