sounds like you are doing a great job....

look i don't think there is a definitive right or wrong, yes or no answer.... everyone has their own opinion, but you just have to do what works for you and your baby, and what you feel comfortable with.... if you feel comfortable rocking him in your arms for half an hour before bed then that is fine, or on the other hand, if you are comfortable with teaching him to self settle in his cot with a bit of waaa-ing or grizzling, then that is fine too.... its up the the individual, and what works for some babies won't work for others... you're the mummy and you have to just trust your instinct and do what you deem right for you and bubs, ignore everyone else (!!!)...

my two cents is, its important to give bubs the opportunity to self settle, a bit of protesting and grizzling is fine and certainly isn't going to harm him, a serious cry though, at this age, i would be consoling and soothing him..... i do understand though that self settling wont work for all bubs and i honestly think our expectations on babies are way out of control (i wish i didnt expect so much in the early days, maybe i wouldn't have been so disappointed?)... on the other end of the spectrum, i have left my dd to cry it out for longer periods, because anything i did to help her ONLY MADE IT WORSE.... i think its all about flexibility and doing what is right at the time.... it will continually change.... once they learn language it does make it a heap easier, as you can explain that its time for bed, so they know whats going on.... until then try to be predictable and have a mini routine before each sleep or nap.... for us its usually a bottle, say goodnight to the fish in the fish tank, cuddle teddy and into bed...

good luck xx