Please post your age for more feedback about gear. It sounds like you have a decent base and, IMO, this is the point that you will benefit most from developing a scientific approach to your diet and training. Because you have your bf under control, you can experiment with raising and lowering carbs in order to put on size while not gaining alot of fat. I recommend the SL 5x5 program for 12 weeks while consuming about 3200 calories a day, including 340 grams of protein. This approach will help you fill out every area of your physique, and with this new quality mass, you will more easily burn off the excess fat. So you will be bigger, and with close attention, even more ripped.