my schedule/workout plan

I'm 22, male, 5'7' and about 175 pounds. I've been going to the gym for about a year trying to lose weight and I can see improvements (bigger muscles, weight more from muscle than fat, unlike a year ago)

my current goals are upper-body definition (or strength, I'm undecided), lower body endurance and a six-pack would be nice.

I'm trying to eat around 2000 calories a day and lots of meat (but it's not easy, some days I'm probably approaching 3000 calories, mostly carbs. I know I'm not losing weight at 3000, but am I gaining or just maintaining current fat level?).

I'm also planning on going to the gym 5 times a week to do cardio for an hour (used to do half an hour 3 times a week), and 3 times a week for muscle workouts.

right now I'm doing 2 or 3 sets of: chinups, lat pull-down, upper back (pulling weights, using a machine whose name I don't remember), dumbell chest press, military press, shoulder side raises, dumbell triceps extension (on my back, on a bench), triceps pushdown using machine, biceps curls, calfs using machine, leg press, in that order. I'm planning on changing from legpress to squats in the near future.

anything else I can do to achieve my goals faster/better? anything I should change?

It's hard to help with your goals if even you don't know what they are.

Probably. What do the scale and mirror say?

Planning on going to the gym doesn't build muscle.

Stop planning, start doing.

Plan not. Do. There is no plan.