Thanks IDJ. I spent some time staring at it last night after getting my foglights done. I was prying up on the edge of the corner light, and got it where it should be, but that would require at least 1/4" of some type of custom made spacer. I've got some different corner lights coming, so I'll see how they fit before I go any further.

I do have a bunch of the aftermarket headlight brackets. I might just try them and see if anything changes for the better.