Need some input

Newfiedan

So here is a little background on me first:
goal: 6 pack (why you may ask? simple I want 1 for the 1st time in my life)
height: 5ft8
weight: 162-163 (depends on day)

I work 10+ hrs a day at a very physical job (heavy equipment tech) that entails lots of lifting/walking and I am shop foreman so pepper some stress on it lol. I train between 2-3 times doing cardio and weights a week or more if time allows. (Some days I can work nearly 16 hrs) I take my diet pretty serious and have managed to shed 40 lbs of fat in about a year and add some muscle to my frame. I kind of hit a wall the last 2 weeks and am seeking some advise form those whom are well versed in diet/nutrition. I use a bodymedia fit (same as a bodybugg) to track cal burns and a typical day at work I burn about 3400-4000 cals a day (depending on how busy I am of course) and on rest days, which are sundays I usually burn 2300-2500 cals. So what I am ultimately getting at is the macro ratios, should I readjust them from the basic recommended settings to say a 40/40/20 split for better fat loss towards my goal or just eat what mfp says is my maintenance, 2540 cals, and then allow my typical burn to do the rest, or back off on my cardio at the gym and just rely on my job to take care of that portion and stick to weights at the gym.

Diary is public for those whom wish to take a look at my diet. I usually take 1 day a week to just eat whatever I want as it helps me stick to the overall better diet plan so feel free to fire away on me for it, way I see it is that it works for me.