I need the help of more knowledgeable fellow FOCer's out there.

My 99 boxeye has had by a previous owner has a 'streetfighter' modification, I assume due to a front ender.  It has a set of FZR clocks and normal mechanical speedo drive, and the obligatory useless in the dark dominator headlamps.  Oh, and the headlamp / clocks harness is a botched mess of a b***ers muddle involving connector strip and tape.  Needless to say I will be sorting this very soon.

Now I was going to get the front end back to almost standard, so I have a set of correct clocks, mounting hardware etc., Fazer speedo drive and insert, however looking into the standard headlight, and seeing a mates Triumph which has had speed triple headlights fitted gave me the idea of streetfightering it the correct way, so I am on the lookout for a set of headlights.

However, after the speedo drive gave out, I fitted a TDM850 one (same 17mm spindle size), clocks all working again.  But this is where I need you good guys for a bit of help.  The mechanical drive is driven by two tabs from a ring in the wheel, like the Thundercat, so this will have to come out - but looking at Fazer parts list drawings I don't see a ring to mate with the 2 tabs on the ceramic insert.

Does anyone have a photo of this side of the wheel hub from working on the bike, or know how the speedo drive is meant to fit?  I don't really want to buy a new wheel if I don't have to.

Thanks in advance.