You need to remove the spot welded brackets from the square headlights in order for the round buckets to fit properly, and for your headlight trim, I'd just use liquid steel, quick, easy, effective, strong. It's the stuff that comes in two tubes and you mix the two parts together,
cheers!