since you've already done some CC, GW is the way to go. We need to re-establish trust so that he knows mama will be there when he needs her.
The way we do GW is we slowly remove our presence from their sleeping routine. You will stay until he falls asleep every night, but every 2 days you will increase the distance between you and DS.
*First 2 nights I want you to do what you're doing now. The only modification is I want you to verbalize "Mama is going to sit right here until you fall asleep. I love you!"
*Next 2 nights you need to sit in a chair so that it's just far enough that DS can't reach you with his hands. We want minimal interaction too. If he cries, you are to comfort him. It's OK to go over and give him a hug and say 'mama loves you honey! It's time to go to sleep!" But otherwise I don't want you to talk to him or even tell him to lay down or anything. He has to do the work of relaxing and fall asleep. You're just there for security sake, to let him know that you're there for him.
*Next 2 nights you move chari a bit farther. I usually like parents to get across the room in about 3 stages. But it depends on how big the room is and how LO is taking to the process! If he seems SUPER needy (lots of crying/whining), then you can just move the chair a bit. If he seems like he's adjusting (some protesting, but quiets down relatively quickly) then you can move towards the center of the room.
*Next 2 nights you should be close to the door. Same rules as above re: interaction
*Next 2 nights you should be in the doorway where he can see you.
*Next 2 nights outside of the room, but in the doorway where he can see you.
*Next 2 nights outside of the room and out of his view. You can say something from there like "Mommy is right here, honey! I'll be here until you fall asleep." If he cries or protests go and comfort him, then return to your seat. If he's just fuss-fussing, then you can just say "It's OK honey, mama's here. It's sleepy time now!"
Before you start this GW process make sure you have a good wind down routine in place. It should involve comfort/cuddles from mommy, relaxation of some kind (books, music, massage, whatever he enjoys). One thing I find works really well with toddlers is telling them what to expect and how to go to sleep, and also explain that EVERYONE is going to sleep. Something like this "We're getting all relaxed now because it's night-night time! Everyone is going to sleep: daddy's going to sleep, mommy's going to sleep, teddy bear is going to sleep, tootsie-toes are going to sleep, fingers are going to sleep..." etc. etc. Sort of verbalizing helps put them in the mood, so to speak! You can also let him know HOW you go to sleep -- this has been an important thing for my son: "When we go to sleep we lay down in our beds and we close our eyes. Then we think of all the fun things we did today. We let our arms and legs and fingers and toes get all limp and relaxed. And then we fall asleep! Next thing we know it's morning time and time to play!" Words are very powerful for toddlers because they believe what we say! LOL! If we tell them the world is sleeping, they believe us. And it helps them to feel sleepier because then they're not missing out on anything!