I've given up on this. A single late night will derail your schedule for a couple weeks (if you're being honest with yourself about how much sleep you need.)
Yes, you have to be rigorous. Or if you have a late night, compensate with a daytime nap
And then have no chance of sleeping that night :)
The best way to 'resync' for me is, is to just to skip the daytime nap and go to bed as usual. This works fairly well, but you are sleepy the whole day of course.