Keep in mind the '25mm axle' wheel's rim is ~4mm offset relative to the hub compared to the 17mm axle...
You're doing it the hard way, but have at it!
would you care to elaborate on either of these statements?
A: are you saying that the hub centerline of two wheels of the same width is different? this will require some engineering but im sure i could figure it out. unless...
B: you recommend an easier way?