Need some help chosing parts - fixing / upgrading to H4s

[Fahrvergnuugen]

Heres the deal:
My car is an 82 SC thats been converted to an 86 widebody (which I don't think matters, but just in case)

My car was hit a few weeks ago, smashing the passenger side headlight, fender & bumper. The insurance adjuster quoted two part #s to replace the headlight assembly:

Headlamp Assembly, halogen 911-631-119-00 $489.63
Headlamp Trim Ring 911-631-142-00 $55.16

Pelican sells the Bosch H4 upgrade C-631-113-02. If I buy a pair of these along with a new fender, will I have everything I need? Keep in mind that I'm getting a new fender - the original headlight assembly and fender were destroyed. I'm not sure if there is a bucket for the headlight assembly to bolt to that's not part of the fender...

That brings me to the trim rings - Will I need to buy one or two trim rings? (will the driver side trim ring from the DOT light work with the H4 assembly?)

Here is what my trim ring looks like (the driver side was untouched)



TIA