New lifting/diet plan

Started taking creatine a couple weeks ago, and lifting 2 or 3 times a week (just using dumbbells in the garage).  Also been using a pre-workout drink (caffeine, creatine, yurba mate, guarana, etc), and whey protein shakes after workouts.  Noticed a big difference when doing that, both in willingness and ability while working out, and in recovery and strength after. 

So I've put together a more structured lifting program (still a pretty vague program, I hope to nail it down more as I go).  I wanted to do a 5x5 Stronglifts program, but I still have major issues with squat form, so I'm just going to do the following:
Sunday - Legs & back
Monday - Light active recovery (walking/jogging)
Tuesday - BJJ
Wednesday - Arms & chest
Thursday - BJJ
Friday - Shoulders and core
Saturday - rest

As I said, still pretty vague because I haven't worked out exactly what I'll be doing on each day (may depend on if I keep working out at home, or go to Mark's house, etc).  I want to track what I'm lifting, so I can be conscious of increasing weights over time.  I also want to program out the number of sets and reps, etc. 

As for diet, I'm going to a high protein, moderate carb, moderate/low fat diet.  Going for 30% protein, 40% carbs, 30% fat, and am limiting simple carbs.  I'm going to start with 180 grams of protein a day, which is 1 gram for every pound of my target weight.  I'm going to keep calories around 2000 a day.  I want to see if I can gain muscle/strength and lose fat for the first month or two (since I haven't been recently lifting or dieting hard, I think I can accomplish both for a little while).  Once I plateau, I'll decide if I want to continue on a bulking phase or a cutting phase. 

Today I did arms/chest.  I didn't have a spotter for the bench, so I didn't push myself too hard on the max weight. 
Benched 160

Curled 95 (with bar, both arms). Max 1 arm is about 40.