That does sound exhausting. Happy to hear about the progress though. Umm, this is quite a common happening - babies not eating on WU due to NFs. Have you tried waiting for a half hour and then offering? The thing is, a NF or two at this age is still very normal and necessary for some.
Could you post your routine? That would make it easier to see. I don't think you should pull the nap early though. That might reinforce the early start. If he is settling without a problem and giving a long nap, that's fine....as long as he isn't thinking of it as a continuation of night sleep