OK, update.
I've found some MC21 forks off a friend. So stoked.
Now I've got a little problem and I hope someone has some suggestions.

Now I understand Upgrading to an MC21 front end will mean I will lose my speedo drive. To re-license my bike, I need to have a working speedo.
Has anyone got any suggestions on how I can make the old speedo work? Or will I have to go to a digital dash? Or can I use the MC16 wheel with the speedo drive?
Cheers
Blair