You're doing the right thing.
I've redone P1 several times, usually after a planned week of cheating abroad. Even though I haven't regretted my gastronomic adventures, I'm usually dying for P1 by the time I get home. I just want to feel healthy and normal again! I usually do a week, but my willpower gives out around Saturday.
My cravings are gone by Thursday morning, but I think the extra days help me to pay attention to what I'm eating and feeling and get me back on track.
I always go back to what I was eating on Phase 2 unless it was something I ate during P2 that triggered the cravings. Usually I just "go back to normal."
Hope that helps!
for your journey!