Ok, that first nap is shrinking to 1hr and he's having a long happy night waking in the early hours of the morning (both signs of undertiredness) - I think he may need just a touch (5-10mins) more A time first thing in the morning and that should sort things for you. I'd say keep feeding him when he wakes for the moment, its not unusual for LO's to eat twice during the night at this age and there is an enormous growth spurt around this time, so that could explain it.