Bulk but with control. Learn to count calories and find out your total consuption of energy per day (there are calculators in the net). Do not eat more than +500 kcals per day in addition to your calorie consumption. Train hard, pay attention to sufficient protein intake.

From where you stand it is possible to gain muscle mass and look leaner in the process.