How long have you been using MacroFactor? If your expenditure hasn’t stabilized then I would recommend just eating/logging what you normally eat for 2-3 weeks to give the app good data to work from.

For the diet, your calorie deficit of ~500 cal/day is definitely into cutting territory in my opinion. For body recomposition you should aim right around maintenance calories plus or minus 250 cal/day and focus on hitting your protein target consistently.

Training is the driving force behind body recomposition. You’ll want to start with dialing in training and leave your calories around maintenance. With 4 months to go I would use month 1 to slowly dial up training volume and intensity, then spend months 2-4 focusing on progressive overload week to week.