Glad to see you again on the forum!
Yes, mine were also terrible. I did several things. The first was having them aimed when the unit loaded for travel. Mine were WAY off, especially the passenger side.
I tried switching to brighter halogen bulbs like the Sylvania Silverstars. Not much better. But another forum member friend "enlightened" me to newer LED headlight bulbs from a company called OPT7 and they are the
answer. I changed both my low beams, high beams, and fog light bulbs over to the new ones. These lights are absolutely fantastic. Not cheap, but we also find ourselves driving at night frequently and safety is worth it.
Here are what I have in mine now: FluxBeam X LED Headlights - OPT7
Now the bulbs we have in our M2's are 9006 for the low beams, 9005 for the high beams, and the 880 bulbs for the Freightliner fog lights I installed.