I only bring this up because it's a trap I fell into, so take it for what it's worth, but I got really fat when I chased numbers on the scale in the hopes of adding muscle to my body. It's really cool to see that scale go up, but it can make you do some dumb things.
Numbers are good, but you won't really know what those numbers look like on YOU until you hit them. Almost every guy who has ever dropped to low levels of bodyfat can tell you stories of how they thought they'd be absolutely shredded after losing 20lbs, only to find out they needed to lose ANOTHER 20lbs before they hit the look they were after.
Were I in your situation, I'd cut down to the bodyfat % I wanted to look like to start with, and then slowly add quality weight from there. I have found that it's easier to measure progress gaining muscle when you are lean to start with. When you start out puffy, it's easy to convince yourself that it's all muscle you're putting on, but when you can actually watch yourself lose some definition, you can tell when you're pushing the food a little too hard.