Remember you can only really focus on one of these goals. Losing fat takes a calorie deficit. Gaining muscle takes a surplus. You may do some of both at once but you want to focus on one goal at a time to make your best progress. You mentioned losing fat first so I am going to assume that is the prime goal. I would do exactly what you did before only this time, I would do one of two things. Either A, add Oral Winstrol at 50mg ED for the last 6-8 wks or B, Masteron E or Mast P at 300 to 400mg EW. Both are great compounds and will add to the dry hard look. Keep that protein high and you will have the best chance possible of gaining muscle while losing fat.