That sounds very sensible. And I bet you don't feel like you are "dieting" at all. I never felt hungry when I was cutting as long as I was eating enough lean protein. Good luck! You are on the right track!
Some people, because of fluctuating hormones, will still retain a lot of water after birth. Have you ever had a good body fat test. . like with calipers or in the water? I think that might be beneficial to you. And yes, if you are almost diabetic, your hormones can wreak havoc on your weight. You CAN still lose. .. but you really need to find out what is happening in your body and with your metabolism in order to address your problems. If you can afford it, it would help a lot to hook up with a good trainer. .. like one that works with competing body builders and fitness models. They can really be experts in all things weight related.
Just wanted to add that I have a friend, her husband is a personal trainer and a competing body builder. She was doing EVERYTHING right and still gaining weight. She is also an RN. . .so she advocated for herself quite a bit in getting to the bottom of her problem. It turns out she had a pituitary tumor.

She was able to have it removed and is making some gains now, but if she hadn't have been working out and eating as well as she was, she most likely would have gained about 3xs the weight she actually did through all of this. So keep up the good fight.