I agree with Marcellus. Get a sling.

Don't buy into the making a rod for your own back thinking. You wont damage him by cuddling him lots. Promise!

I feed/fed and rocked both my girls. The eldest is almost 3, but has put herself to sleep from about the age of 18 months. My 16 month old sometimes goes to sleep on her own, sometimes i feed her and sometimes a cuddle her to sleep.

I found the 3 month mark was when my babies started becoming much more aware and things became more challenging. A sling saved me a thousand times over. Sleep around here goes in cycles, it's great then we have a few hiccups for a while and goes back to being great. This phase wont last forever.

Have you read The Wonder Weeks or What Every Parent Needs To Know, i found both of these a great resource.