Any advice/constructive criticism will be greatly appreciated.
Background Info: 5"5' currently 178lbs. Around 3 months ago I weighed about 250lbs. I decided to lose weight and did so initially in a very unhealthy way by basically just doing a lot of walking and only taking in 400-500 calories. After losing about 55ish lbs like this I went to the gym with a friend (I would go on occasion before starting to loose the weight) and decided to bench, found that I went from being able to bench around 235-240 to being able to bench around 190. I realized right then the err of my ways and how much muscle I was loosing. I did a lot of reading on these forums and changed my diet to around 1600 calories and continued my weight loss without much more muscle (or noticeable strength) loss.
I am now happy with my weight but am trying to get into good lean shape. Basically I just want to recomposition at this point and gain as long as its muscle that I am gaining. I would also like to get my body fat lower but realize that it will be hard to gain muscle and loose fat at the same time.
Exercise: I do cardio 5 or 6 days a week for 40-45 minutes usually burning around 400 calories. I do a five day split for lifting that is pretty intense.
Diet: Consists of 1650-1800 calories depending on how much I can eat. The macros are on average ~40grams fat, ~120grams carbs, ~250 grams protein. This brings me to roughly 20% fat 30% carbs 50% protein. The carbs come from either whole wheat/oat bread or brown rice. The protein comes from very lean turkey meat, chicken, and NutraPro. The fat comes from the aforementioned foods, omega supplement, and a slice of cheese.
Supplements (are worked into above macros) : Animal Pak, Animal Omega, Animal Flex, Animal PM, Uniliver - Also just finished a cycle of AT2/OEP Stack.
Main question is what do I need to change to stop losing weight, not gain fat, and build muscle? I know I need more calories but seem to have that fear of getting fat again. Sorry for such a long post, thanks for reading.