Hi, sorry for the rough night! Hugs!!
Well, if it were me I would set a time limit such as don't feed before 5 hours, or 6 or 7 and keep at it until he falls asleep, even if it goes past your time minimum. THen, even if he has only been asleep 10 minutes, feed him. That is how we have worked towards pushing our NF out.( Afraid we haven't eliminated our NF yet, at 11 months!!!)
Does he have a lovey? That has done wonders for us.
I would work towards the settling being less intervention from you, maybe putting your hand on him less and less, then moving further and further away from his bed and try to use your calm voice with a sleepy phrase most of all.
Are YOU holding up OK? I know long nights with lots of crying can really take it out of you. When I went through PUPD with my DD I found the long sessions to be draining especially if it was the endless grizzling and then hard crying. I would put an earbud of an ipod in one ear for a while to kind of keep me "above the chaos". I could still hear her to see if she needed a hand or to be spoken to but it helped me not feel "stuck" or desperate if we had been at it a couple hours!!
Hope this helps, let us know if you have more questions!