Hi there!!
I think you should stop w2s little by little. Next time you go inside the room, watch and see if your lo needs your help. If he starts waking up, then apply pressure, but it is all a matter of trial and error.
You will have to experiment and see if he is ready for transitioning by himself!!
For me, it was like 2 weeks, but some moms have done it before, and some have done it after. Try and see if he is ready. If not, you can always do it again.
Alexa