Back when I had to drop some weight, I talked to a nutritionist and he gave me a few tips that made a huge difference:
- Getting muscle is really important - this doesn't seem to be a problem for you since you do calisthenics and sometimes lift. By getting more muscle you're increasing the ammount of energy your body needs just to function normally so you end up burning more calories than before, even when doing nothing.
- PROTEIN. Really, really important to maintain the muscle tissue when losing weight.
- Veggies. I used to hate them. The nutritionist told me to try to eat just a bit per meal so my body would get used to it, and now I fucking love veggies. Especially broccolli. Broccolli is love, broccolli is life.
- Count the carbs. One of my problems was that I absolutely love rice, and any type of pasta. I'd eat plate full of them, no joke. He told me to not go over 150 grams of rice/pasta per meal (compensating with more meat or even veggies) and it made a HUGE difference. Lost about 4 pounds in a week with only this change. Grains legumes (beans, lentils, etc) can be used as a substitute if you want to completely cut carbs, or just to diversify.
- No sugar. As little salt as possible.
- Fat is really important, as you noticed already. But avoid at all costs saturated fats, unsaturated fats are the shit. You get these from fish, peanut butter (commercial ones usually have too much sugar so I like to make my own), seeds, almonds, nuts, vegetable oils, etc.
If you get a balanced diet you don't need to fast or starve. In fact I ate all day and still lost a lot of weight pretty fast
Anyway, really nice progress dude!