hi, i find keep attempting to put the baby down once they are asleep helps in the long run.
my son still can only accept the yao lan sometimes in the day, otherwise he prefer to sleep without move and his hand free to stretch.
his worse hours are between 5-6 plus pm. after 7pm his night mode keep in , once we on the night light and place him on his bed he will fall asleep by himself.
usually I will wake him up at 9-10 to wipe his body and feed him , after that I will place him on his bed again and he will doze off by himself till 3-4am when he wake for his milk. after that he wake up in the morning at 6-7am for bath.
I find that black ceiling fan with orange light are very useful for my son, he loves to look at ceiling fan and light and fall asleep after a while.