New Workout Plan and Nutrition Update

Current Workout Plan:
Sunday: Upper heavy(3-5 reps)
Snatches or cleans
Push presses or jerks
Pullups
Bench press
Monday: Lower
Box jumps
Deadlifts
Glute bridges/hip thrusts
Walking lunges
Abs
Tues: REST
Wednesday: Upper hypertrophy(6-10 reps) + glute bridges
Hip thrusts
DB presses
1 arm rows
DB incline chest press
Pullups
Curls, dips, lateral raises
Abs
Thursday: REST
Friday:  CrossFit
Saturday: *Optional* conditioning workout
Farmer's walks
Battle ropes
Ball slams
Sprints

My goals right now are to focus on upper body strength(bodyweight bench press for 5, 100lb overhead press), and lower body muscle building.

I came across an article about some ways to build up legs that I have not tried. For one thing, I'm going to add calf training back in(bleh) twice a week along with more jump roping to see if maybe my non existent calves will grow! I'm also going to add in more single leg training, such as Bulgarian split squats and front loaded reverse single leg lunges(which I've never done).

And I'm what dreading most: "widowmakers". Basically, a widowmaker is when you do a 20 rep set of squats with a weight you would normally only do 10 reps with. It is brutal! I know because I did a bodyweight squat challenge a few months ago and got 30 reps with 125lbs, and it was awful. But maybe higher reps is what I need for my legs to grow in addition to the heavy stuff. I also found this article:
http://www.t-nation.com/free_online_article/most_recent/more_reps_bigger_legs

As far as nutrition goes, lately I've been a little less strict with my eating, as in not tracking my food or paying attention to macros or anything like that and eating more carbs and treats here and there(as in Kind bars and caramel apples-those are my weakness!). And it feels great. I'm not stressing about my diet, I'm not trying to lean out or be a certain weight or get my abs to show, and I love it. My stomach may not be as lean as I'd like it to be, but I don't have to have a ripped stomach all year round-I mean, who cares? I have no one to impresss.

I've even been doing less conditioning and finishers after my workouts and not even doing any walking at all, although I would like to add the walking back in. It's nice to take a break from being strict with my eating, and if I want to lean out a little more( for what reason I have no idea), I know what to do and would tighten things up a bit. But a little bodyfat for me right now doesn't bother me.