You could try an MC18 set of clocks, they seem to wire into most NSR's without too much fuss (excluding '28).

I've fitted MC18 clocks to a couple of '21's (I know you have a '16) and they worked a treat.
_________________
If I have to take the carbs off once more...