Your feeding schedule looks fine, just be careful with snacking! if your lo snacks during the day, that encourages the NWs b/c he doesn't take a full feed during the day every 2.5 hrs. So, try to stick to 4 hr feeding schedule and see if that helps. Now that your lo is going through a GS, you can try to clusterfeed him in the late afternoon. So may be something like this:
E. 7.30 am
E. 11.30 am
E. 3.30 pm
E.5.30 pm (Clusterfeed just while going through a GS)
E. 7 pm