The best direct replacement is a set of MC21 SE/SP forks. They slot straight in and can retain the MC18 calipers, discs, wheel, and front fender. You will gain preload and rebound dampening adjustment, but not compression adjustment. This setup also means you do not alter the steering geometry in any way.
Welcome to the forum.
_________________
Andy.
NSR-WORLD.COM
Please keep all responses to Forum posts on the Forum so that others may benefit.
Please DO NOT PM me for technical advice. My time is precious, and you will probably receive a faster response on the Forum anyway.
Check us out on Facebook! Please "like" our page!