Couple of thoughts - routine-wise I think you'd be best to decide which nap to keep 'long' and then trim the other one to get one full-length nap ie 1.5h or more. At the moment you have two 'middling' kind of naps and that may not be as restful. So either push out first A to get 1.5h or more, then offer a catnap in the afternoon to get you to bedtime. Or keep first nap where it is but trim to 45 mins in the first place (may need to go shorter but that's a good place to start if he is used to an hour) and bring pm nap earlier hoping for 1.5h or more. Then full A time before bed. Which do y think would suit you best?
NWs could be related to not enough A, but am I right in thinking you've never had consistent STTN from him? My feeling is you probably need a consistent approach to NWs. How are you settling him right now at the times you aren't feeding? I know it's hard if he's in your room, at this age it can be really distracting though. Is there anywhere you can move him? I don't think your wakings are hunger related really, most babies can get through the night by this age with no or one feeding if they are having adequate milk and solids in the day (milk as more important before age 1). If he has a paci can you teach him to replug? Scatter lots in his crib so he can find one easily? And then when he wakes ignore him unless he really needs you, and then only interact to say in a boring quiet voice "find your paci, lie down, sleep time" or something similar. You could pat the mattress too if that helps him understand. What you want ideally is for him to settle himself back down without you having to do anything for him like find his paci, pat his back or feed him. You can be there with him to reassure, and then use gradual withdrawal to remove your self from the situation
. As I may have mentioned before we got into a bit of a habit feed trap with DS and just weren't being consistent with how we dealt with NWs, once we got that in hand our nights (although not perfect) improved greatly.