Dunno about weaning from the df, I could never get either dd to have one, so I just demand fed them thru the night until they stopped themselves! I guess I was confident that they were waking for a feed, not for comfort, so didn't mind (I sorted out the bags under my eyes with lots of concealer!!!).
Dd#2 is transitioning herself off nightfeeds at present, sometimes she wakes for a feed, usually between 11pm and 2am, sometimes she doesn't, if she does I do feed her, but if she wakes after 2am I just give her cooled boiled water 'coz otherwise she won't have a good breakfast feed. It does mean that I am currently having some seriously disturbed sleep, but I'm sure it'll pass as she realises that she has to eat enough in the day 'coz she can't top-up on milk at night! She is older than your lo tho', so perhaps just go with his lead again?! Or offer him the water if he wakes at df time, leave it if he doesn't?
Sorry if this is a bit vague, one thing I've learned by having 2 los is that altho' they need boundaries to keep on track, they're generally pretty good at knowing what's right for them! I've taken dd#2's lead a lot more than I did with dd#1, and it seems to have helped keep everything more relaxed.
Best of luck, let me know how it goes,
Ax