How would you fix this ?

I'd bring things closer to start. I suspect the fender could come back a little on the top.
The factory used shims in various places on the fender