231 to 176 lbs and now skinny fat to fit. Help and advice needed :)

Hey lovely people

So in 2012 i started loosing weight and got very fast results but exercised very wrongly. 1hr cardio and 1 hr weight lift everyday without taking care of nutrition. I didn't know much about nutrition then.
However, now im 176 lbs and want to get fit, so i don't know if it will involve any weight loss, it might it might not. I'm creating a defecit but it takes so much time to log everything. Is there a better way that you do to know that you're under your calorie requirement each day?
Also, what kind of weight train should i go for? Right now I'm mixing most body parts every time ans i go 4 days a week. Have been doing half an hour of yoga everyday and started to learn swimming 2 days a week. I have bad control over sugar food but only during the night. I can control fairly good durin

g the day.

Thanks for reading and your time.
Also, I'm 6.1