Hi & welcome to BW.
I'm sorry you're having such a sleepless time. It is exhausting once back at work.
My first thought would be to work on stopping the NFs completely. I think while he could still get milk at night, he will still wake at night looking for it.
We often get a wake around 10/11 with both of mine (&shave never done a DF), I think it's just something to do with sleep patterns/transitions..or maybe disturbance of us going to bed around that time! How do you resettle at that wake up?
Getting checked by dr sounds like a good idea, just in cas of discomfort.
Only other thing I could suggest is looking at BT and BT routine. 6am-7.30/8pm is quite a long day at this age. Have you ever tried an earlier BT e.g. Closer to 7pm? (sometimes NWs are from OT).
This might sound odd too, but my DS always found Night Garden a bit over stimulating, we didn't let him watch it as I was convinced it disturbed his ability to settle and disrupted his sleep. Have you considered a different WD activity e.g. Different programme or even just quiet activities like drawing, puzzles, books or music?
The BW forums discourage CIO and would suggest you try WI/WO instead as this approach still gives opportunity to self settle (which may involve crying) but you go in again if cries escalate. This might be an option to help wean off NFs. When night weaning my DD I used WI/WO (or got my DH to go in!) & this helped a lot.
Toddlers: Walk In/Walk Out vs. The Gradual Withdrawal Method (HOW TO CHOOSE)