Hi there,
For how long have these NWs been happening? There is usually a decent growth spurt around 4mo and also some big developmental leaps that are notorious for causing a sleep regression. So, that may be part of the problem.
I do think another part is the daytime routine. You're right to be pushing his A time longer. I'm sure it's hard to do in the morning, as he has quite a long A time at the end of the day and then sleeps an unsettled night. But, keeping that first A time too short will likely only perpetuate the problem. He doesn't sleep a full nap after that first A, thus another sign it's too short. Try keeping him up even just 5-10min longer for a few days and then another 5-10min for a few days until you start getting a longer nap there. Ideally, you want an A time of about 1h40/45min-2h at 4mo old. The longer A times and hopefully longer naps should naturally push your feeds to 3.5hr apart, which will help him take bigger feeds and hopefully help him last longer at night as well. This should also help cut down that long A time at the end of the day, which is likely making him go to bed OT and causing part of the unsettledness.
Finally, I do think it's worth persevering with some shh/pat at NWs. Since you've been using it during the day, he will be used to it. He should be able to go at least 3-4hr between feeds at night as well. So, if he wakes before that time I'd use shh/pat to get him back to sleep. If he's having none of it after 20-30min, you can go ahead and feed as he's quite young still, but hopefully he'll start going back to sleep sooner and stretching those wakings out. Are you sure he's warm enough in his cot?