radnor

At the moment I'm considering fixing the slightly corroded forks on my '96 XJ600N and the slightly feeble single disc braking. The idea is to replace the forks and yokes with those from a later twin disc model. Then a new wheel and calipers. I believe that fazer or R1 calipers fit the same mounting holes with no alterations but require floating discs which the divvy doesnt have. The problem is, and this is where I'm a bit stuck, what wheels will fit the forks and have floating discs? So far I believe that the TDM850 and thunderace are potential candidates but what others and can anyone confirm that these should work. Cheers