Wow. Great job on the forward underneath section. I think you are correct on the holes. Mine all appear to be round not oval.
Also interesting is my front valence is attached to the fender via bolts and not like yours with studs/nuts.
Here's what I am working with. I'm getting there but the front section is tough with all the different parts and finishes.