Something fits with just a little modification
The taillights fit after trimming the rubber seal a little
Once the holes on the fenders were elongated the headlight buckets fit
The amazing thing was after all the work on the door gaps the edge of the hood lined up with both headlight buckets from CJ Pony Parts. The Dynacorn headlight buckets have been on back order for over a month and I was told probably another two months before they would be available so we got them from CJ's. They are a little ripply and will require some blocking but they fit.
