My LO is 7 months and is also waking up for a NF. She was going without for months, but around the 6 month mark she would wake up every hour from 4am on and I finally pinned it down as hunger. Since then she wakes up once a night for a feed. But unlike your LO, mine has become resistant to feeding during the day ever since I started her NF. I am now pumping and trying to get 3-4 oz. in her at each feeding. I don't dare wean her NF right now, but am assuming that they won't stop until she starts drinking more during the day. She's SO easily distracted though.
If you do want to eliminate the NF, because your LO drinks so well during the day, maybe you could slowly wean the NF by a minute or so every night. They should make up for it during the day.