are the 17" wheels from an X or R not plug and play for the tenere?

They are, I bought a set of R wheels with new Distanzias for �170 and stuck them on.
Changed to a master cylinder and lever from a WR125 a braided hose for a
KX250, lost half the weight of the hub and a disc, plus a caliper and have a considerably lighter front end with a half decent brake.
The bike now steers quicker with less counter steer effort required on initial turn in.
Reason for the change was the spokes on the Z wheels had corroded so badly I couldn't be arsed trying to resurrect the damn things anymore.

Pete.