Had the same issue as you. The dipped beam was perfect, but the only use for the high beams were plane spotting.
I read on an american forum about the procedure for correctly setting both the dipped and main beams (yes there are adjustments for both but they are linked, and have to be done in a particular order).
Not being comfortable trying this myself, I took it to my local dealer and they came back perfect (both high and dipped beam). So It can be done, but you really need a beam setting machine to do it properly.