Have you tried to settle without feeding, especially at that second NF? With mine, I would give it a decent effort of trying to settle without feeding for a night or two -- if it didn't work and they would wake up again shortly after, I would feed them as I felt it was probably hungry. He probably still needs one night feed in addition to the df right now, but if you notice that he's not really nursing well at that second NW, it's probably worth trying to see if he'll drop it.