I also have found that sometimes getting back on track means some tweaking in the schedules, say if ds has gone through a couple of weeks of restlessness due to sickness, teething, etc. we might end up having a later bedtime, or a different routine.
With ds, walk in/walk out didn't work either. I had a particular rough patch last december with teething, where sleep was off for a whole month, including naps, he was so overtired that i never knew when to put him down or how much he was sleeping actually.
What we did is that dh and i took night shifts. We'd do the routine at the very same time as we used to, being careful that it was a reasonable awake time between the end of his nap and bedtime, so he'd be tired. With the help of some pain aids (remember you have the 2 year molars coming on, and pain can be disguised as restlesness) we'd put him down and put a blow up matress on the floor. Everytime ds got up, we'd shsh and tell him, nighty night, go to bed, I'm here for you but im tired and need to sleep. THat way, if he'd have a night waking, we'd be there and we'd prevent him from standing and freaking. THe rough time lasted like a week. Then we were able to return to our own bed for half of the night and by 2 weeks we'd only put him down and leave and then we'd return for the one night waking he was still having.
Sometimes with spirited little guys, the pd takes longer than expected. By giving him company and reassuring him but letting him know things are not going to change, he might get the message sooner cause they understand a lot at this age.
HTH and Pm in case you need any more details. GOod luck!