Thanks Bruce! I just did the job (including polishing all the pieces I removed) in less than 30 minutes. In fact it was so easy I'll probably replace headlamp bulbs this way in the future. For those searching in the future, here's a writeup:
Headlight removal procedure
Ensure steering is unlocked, you'll need to move the handlebars from time to time to get access. All screws are the same head, but vary in length and use of washers. Be sure to keep track. Left/right are as if you're looking at the front of the bike.
Remove both hand guards/wind deflectors (2 screws each)
Remove both filler panels between hand guards and wind deflectors (2 screws each)
Remove lower front panel screws (2 under the air ducts, 2 under the filler panels you just removed) and pull the panel forward. Note that there are two tabs about an inch wide going into the upper front panel. These will come out with a gentle tug.
Remove the indicator bulbs from the rear of the housings (a quarter turn releases them)
Remove the lower front panel
Remove three screws holding the headlight in (1 at each side, 1 at the bottom)
Wiggle the headlight forward to free it from the upper front panel
Remove the rear cover by levering the retainer down (I'm not sure this is necessary actually, but it does give more room)
Remove the spring clip from the connector on the right side (use a flat bladed screwdriver to lever it off, then look for where it went) and detach the connector
Pull the headlight out further and turn it upside down carefully, there's still wiring attached
Pull out the running light holder. This is a push fit, mine was scarily tight but it came out OK in the end.
Reverse the process and you're done!