i would be inclined to cut the morning nap off at 1.5 hours, and definitely by 2 hours. any more and i think you're going into nighttime sleep.
plus, by shortening that morning nap, you bring the day up a little earlier, and that catnap should be done before 6pm - having a baby well ready for bed by 7:30/8pm.
short activity time before a feed may also help if you're having problems with your lo focusing on eating.
HTH