After market should be fine. Do you have to adjust the headlight to the right height before tightening or it just falls to the right place naturally?
Tighten everything first and then adjust. There could be rare instances where once the new headlights are installed, no adjustments needed but for most, it'll need to be adjust. Fortunately, it's a very simple task, just two adjustable dial knobs on the back (one for vertical and one for horizontal adjustments):
