Your 2nd routine sounds the same as our's here at home, and it sounds good to me.
I would say it's probably just a phase and if you just keep at what you 'were' doing that 'was' working, then things will fall back into place.
I say this b/c I too have a really good sleeper and each time she gets abit off course, I tend to get all anxious about it, but each time if I just kept really calm (on the outside
) And just kept doing what works for us (which was go in, reassure and tuck back in, and then if I would have to go in more times, then I would keep words to a minimal, if not any words, and retuck) eventually things just always fell back into place for me.
Although, sometimes I did have to change things. 2 mths ago I took away her soo-soo. It didn't bother her nighttime sleep, but she stopped napping. After 1.5mths of this, she said to me on day while getting ready for her nap "can I take my sippy cup for nap?" So, I said "okay Isabella, but you have to have your nap, or tomorrow mommy won't let you have it again" ~ well, she napped, and since then it's been 'prettygood'.
Has anything changed in his routine? Sometimes she gives us a hard time and when we sit down we realize that we'd been skimping on her nighttime routine, then when we fix that, she gets back on tract.
Just some things to think about!
Hugs... I know how frustrating it is when sleep problems come up