I had that problem on my passenger side fender. It had been hit before (minor/mainly bumper), and it was repaired off the car so full grill wasn't test fit, only the headlight bezel. Didn't discover this till after paint. Rather than rework the painted fender, we moved the headlight bucket as you suggested.

Since your having the problem on both sides though, is there any way you could just adjust the front of your fenders outward?

Tav