I just wanted to pop in and say it's worth leaving your LO for a bit to see if he settles. I was feeding my son constantly overnight as he was waking every 40 minutes and I often would feed him back to sleep out of desperation. I'm not sure if it's because I did a little sleep intervention or because I trusted that he might go back, but I've started to leave my son to fuss for a bit(he was full on awake, staring right at me through the video monitor it seemed) and he managed to put himself back to sleep several times. I almost went in a few times but knew he wasn't really upset and waited. I never believed it was possible but it happened! Worth a try! Can't hurt anything. I don't feed my son at all last night!
I was reading this because his naps are terrible and short too! Hoping to fix those next.