Hey Joel
I had exactly the same thing on my 06. It would flicker for a while, then be fine, then turn off altogether. The period of operation/non-operation was very unpredictable, except it would always work fine within 100m of the dealer or with a dealer guy riding it!!!!!!
Eventually I tracked it down to dirty contacts in one of the connectors behind the headlight (I had checked the connectors for tightness a few times before), and put a bit of contact grease on it. Never had the problem since.