To check your answer - just replan the whole flight with an extra 4000kg load and count that as fuel, aircraft doesn't care if you're carrying bags or fuel (until you try to burn it!)
If your (careful and correct) plan including 4000kg is significantly different from your fudge factors, I'd be questioning the fudge factors.