I want to buy new ones but the 2 I found on amazon (both are for around $80 for both) either have a problem with the wire harness connection on one of the assemblies or have issues with the beam aim.

Aftermarket headlamps, even ones made by major aftermarket companies, are doo-doo as you have discovered.

Consider Depo, a major aftermarket supplier of headlamps. It sold replacement headlamps for the Ford Taurus that didn't fit the Ford Taurus.

Was wondering if anyone knows of a good source for the headlights that would be good.

eBay, look for OEM headlamps.

Left, used

Right, brand new

And while you're at it, the best, brightest bulbs for your Focus are these.