So, yes, it is an old thread... and also an old problem. No, it's really not the auto self-modulating headlight safety option.
Alas, my 'nakey bike' has no fairing to cushion against. It is finally making it to the top of the to-do list and I will have a definite fix over the winter (don't know exactly what it is yet). But it will have to do with taking up the extra space in the groove of 2 rubber grommets (low and behind the headlight) that hold the bottom of the light/instrument cluster.
til later... (maybe much later)...