I would probably work on reducing the night feeds to encourage him to eat more during the day and I would try and stick to 4hr eating schedule as opposed to feeding every 2hrs during the day. He may just be snacking rather than taking a full feed, which leads to him wanting to eat at night. There is probably a feeding to sleep association as well and you might have to do some sleep training. If it were me, I would pick 2 night feeds, probably the 10-11pm feed and then an early morning feed (between 3-5am) and for the rest of the night wakings, settle him without feeding to sleep. Would DH be willing to help out? I always found dd would settle better/faster with dh as he doesn't have the milk
His daytime routine (sleep wise) looks good, we were down to 2 naps too but our feeds were 4hrs or thereabouts apart, which is what I would suggest doing. Also, have you started solids yet?
With pu/pd, you don't have to pick him up... that may be too stimulating for him. My dd3 still responds really well to shh/pat but if he doesn't, try sitting by the cot and patting the mattress. Whatever you do though, don't give in and feed as it will be pointless to try and resettle for 1hr and then to give in and feed.
Let me know what you think