I think you want to be in the room only long enough to help him back down, but not longer than that so it does not become a prop, so I think you did fine.
You could do the sh/pt at night, but it sounds like that really isn't much of an issue for you?
I actually did the same thing as you. I started with Babywise, and the first and only time I ever did CIO I thought how on earth could that be natural!! And that is when I find BW! Good luck!