if your dead set on keeping the square headlight look and grille, buy  a
set of euro e-code square headlights off ebay.de or ebay.uk. the lens fluting
gives better output than the DOT north american headlights.   you will
only need the outers as the inner hi beams are the same as the european ones.

i run the 7" round e-codes in my 84 and 85, and i bought a set of european
e-code squares for my '89 since i wanted to keep the square light look.