Hi there. My DS is 20 weeks and I totally know what you mean. I thought I would share a couple of thoughts and ideas that have helped us

. I think the earlier bedtime is a great idea regardless, once we started on that EASY got much "easier." Looking at your routine it seems like you really need to get him to hap longer. How is he when he wakes up from his naps? Does he cry and still seem sleepy? He is really only cat napping all day, not enough daytime sleep leads to fussy nights. Mine did the same thing for a while and I thought maybe he was just a short napper, but once I committed to making him stay down (using shh/pat) for 2 hours he caught on and now is on a textbook 4 hour easy taking 2 two hour naps a day plus a 30 mins catnap at 5:30 and he is STTN (going to be at 7:30, DF at 11, and waking up at 7:30am). So that would be my first thought is to get him to nap longer during the day. There are lots of post about this on the nap board for more help in that department.
As far as he is fussy at night, he may just be a fussy sleeper. If he is not fully waking then I wouldn't worry, its just his way of settling/sleeping. If he seems to be waking himself you could try swaddling? Might be kinda late for that if you haven't done already. My LO was about done with the swaddle at 16 weeks. We put little mittens on his hand at night so he can't scratch himself so much. That really seemed to help. The leg banging thing is pretty common, mind does it too when he is settling himself.
I agree he probally doesn't need the nightime feed unless he is taking a full bottle, in which case you will want to try and feed him more during the day. He is just getting to the age where he doesn't need that feeding most likely or wont soon. I always knew that mine needed the food when he took a full bottle at night and a full feeding the morning. Plus he would NOT go back to sleep is he was hungry no matter what I tried.
Remember this is a big transition age and things do go crazy for a while. Try to hang in there, it does get better.
Oh one more thing...does he sleep in his own room? If not and all this is keeping you awake and not him I would move him out. My LO was so loud at night he moved into his own room at 2 weeks. I now sleep across the hall from him and close both of our doors and sometimes even put in ear plugs. He is just a loud sleeper and I find that if he really needs me I always hear him, LOL! You might try that and see if you get more sleep.
Good luck, let me know how it goes
