Are any front wheels a straight swap with the three spoke MC16 wheel? I have an MC18 rear wheel and would like a matching one up front. Having had my MC16 forks re-chromed and sourced replacement calipers and discs I'm reluctant to try to find a complete front-end from a later model.

I know that the spindle must be the same diameter as the 18/21 as the bearings are the same, but I'm not sure about the other dimensions and the disc fitting. The MC16 has bolts right through the hub that hold both discs on - I believe later models had bolts screw into the wheel, but may be wrong.

Thanks for any help!