A disastrous two weeks of dieting

Well, the last few weeks have been tough from a diet/workout perspective. Things were marching along well at the beginning of the month...I had a new 1 rep max 1RM deadlift of 160kg while in Phoenix with Annelisa. I also was able to show off my brand new muscle up. Two days later, i was able to do 4 muscle ups (nor in one set). Two days after that, I did the "12 days of crossfit" workout and improved by about 8 minutes over last year, finishing with the 8th best time.
Unfortunately, I woke up the next morning with a sore left shoulder. It felt very similar to the symptoms that I had just rehabbed out of my tight shoulder, which took a year to rehab. So I have backed off on working out for the last two weeks. I'm doing Wendler 5/3/1 deadlifts and squats and some shoulder mobility work with Steve 2 days/week and Dave's mobility class on the weekend.
The good news is that I was able to go 7 reps at 135kg on the deadlift which translates to an estimated 1RM of 166kg using wendler's formula. I looked back at last December and my 1RM was 135kg.
This is about 23% improvement y/y. Not so bad considering I wasn't really doing much the first half of the year.
But the other half of the problem is my diet. We had snacks at work including Oreo cookies, pizza at lunch, Hershey's kisses for dessert at home, etc etc. and once I start falling off the wagon, it's hard to get back on. As Dave says, the only way to get rid of sugar from the diet is cold turkey, like any addiction. So I've put on about 5 pounds.
Now that I've written it down it doesn't sound so bad, but I need to stop the fall. The good news might be that we're heading for vacation next week and we will be away from all the crappy good around work. The bad news might be that we'll be in wine country, and we will be wine tasting. Too early to tell.
I'm also teaming up with one of my colleagues starting when we are back in January to do our own leaning challenge.
And Steve thinks maybe I can start doing handstands again in January.

I started back on paleo diet this morning...I am one hour into it. I had a diablo omelet with goat cheese rather than jack cheese, with veggies rather than potatoes on the side. With diet coke :(
One meal at a time!
Update: I didn't have any snacks after brunch, and dinner was a 1/4 lb bison burger with about a tsp of mayo, I ate ~2-3oz of turkey sausage off of Toby's plate. I also had a cup or so of sauteed onions and peppers and a couple cups of broiled broccoli, with some mayo mixed in. Finished off with about 2tsp of organic almond butter. Unfortunately this brand has some cane sugar mixed in, but not much.
All in all, a good day recovering from a bad week if I can keep from snacking this evening.