I'd try feed him a bit sooner too? At his age, he will most likely only be able to handle about 40 - 45 minutes of wake time before he gets tired (this wake time includes the time it takes to have a bottle). If kept awake longer you will have big battles getting him to sleep. It seems like you barely see them when they have short wake times, but it definitely helps

Do you know his tired signs? They could be yawning, grizzling, jerky movements, etc. As soon as you notice a tired sign go and wrap him up take him to bed (I always rocked my babies off to sleep at that age).

You will hopefully find that he settles and sleeps better when he's not over-tired.

Hammocks are an absolute God-send, I love ours! Slings are great during the day too. I used to put DD down for a nap and if she woke to soon I'd put her in the sling to get her to go back to sleep, it worked well for us

But the main thing is making sure he isn't kept awake for too long, I reckon you'll see a good improvement within the next day or two if you shorten his wake time

Good luck