I am doing the same thing. Just bought the lamp with all the trimings from the original drawing, will post an update when I have figured out mountings exc.
Here are the part nr I ordered from Yamaha:
1 pcs 39P-84300-11-00 HEADLIGHT ASSY
1 pcs 39P-23131-00-00 COVER, UPPER 2
1 pcs 39P-23132-00-P3 COVER, OUTER 2 | MBL2
1 pcs 39P-23121-00-00 COVER, UPPER 1
1 pcs 39P-23122-00-P3 COVER, OUTER 1 | MBL2
1 pcs 39P-83559-00-P3 COVER, METER | MBL2
1 pcs 39P-8431R-00-00 STAY, SETTING
1 pcs 20S-28396-00-00 PLATE 1
1 pcs 39P-84119-00-00 STAY, HEADLIGHT 2
2 pcs 90167-05076-00 SCREW, TAPPING
2 pcs 90202-05002-00 WASHER, PLATE
2 pcs 90183-05042-00 NUT, SPRING
2 pcs 20S-28376-00-00 TRIM
4 pcs 90111-06127-00 BOLT, HEX. SOCKET BUTTON
1 pcs 90183-06069-00 NUT, SPRING
2 pcs 90111-06127-00 BOLT, HEX. SOCKET BUTTON
2 pcs 91317-06010-00 BOLT
2 pcs 90480-14004-00 GROMMET
2 pcs 90164-05001-00 SCREW, TAPPING
1 pcs 92012-05012-00 BOLT, BUTTON HEAD
2 pcs 95817-06012-00 BOLT, FLANGE
2 pcs 90464-10112-00 CLAMP
1 pcs 39P-82509-10-00 WIRE, SUB LEAD
2 pcs 97702-50016-00 SCREW, TAPPING
A little note to my self before I do something like this again; Check Prices before ordering!!! Cost me an arm and a leg this light...