I also cuddled my son until he was asleep, although he was younger, 12 months old. What I did was the walk in/walk out. I would still cuddle him for a minute standing in his room, and then tell him night-night and put him in his crib and leave, as he would almost immediately stand right up and cry out. I would wait no more than 10 seconds before going back in again, reassure him that I was there but kept it very simple and said night - night and then left again. I would do this over and over agin until he no longer cried when I left. I kept my visits short and sweet so he knew I was there if he needed me but that I was not coming in to play, and to give the clear message that it was time to go to sleep.