It looks like a good plan- pretty similar to what I do actually.
As for workouts, I need structure, and my routine is constantly changing because I can't seem to find the right structure. I did Jillian Micheals' 30-Day Shred and liked it.
I hear ya on the chocolate. Chocolate and nut butters. They're evil. :P