Should I change my activity status?

When I first started MFP last year, I had it set to lightly active because I'm a student. Last year, I tended to sit down and learn the theory most of the day, come home and work out for a half an hour or so, and than sit on my bum studying all night.

Now that I'm in my second year of college, I have more practical work. As a Veterinary Technician student, sometimes I'm on my feet for several hours at a time, or cramping up my arm muscles restraining animals while I patiently wait for my fellow students going through their practical exercises. I also try to work out every day ( sometimes I skip a day or two, but I usually workout min of 4 days a week). I have been going to the gym for strength and have been doing a minimum of 20 min cardio at home ( or there, time allowing).

My calorie goals have been set to 3 workouts 30 min minimum, with a weekly total of 120 min and 720 calories. The last 2 months, I've been having a range of 1500 - 2100 calories burnt which is WAY over my goals. ( HRM calculations which have been more or less been close to MFP ones)

So, I was wondering if I should change my activity status to Active, just up my goals, or both?

Thanks for your time!