I am going to do another rewire as well, hoping to make it cleaner and final this time around.
The rear wheel swap is going well too. The axle for the ninja is also a 17mm and is very close to the proper length too. And I like the look of the rims too. If I end up really liking it I might get a front wheel for it to match.
I have a 3d printed caliper bracket to check for alignment before making the part on the mill. Seems like its going to line up! (and the mount will end up extended over the swingarm and being thicker where the bolts mount.