When you put it all back together, before you tighten everything up, ensure that the speedo drive is located behind / against the plastic tang which comes off one of the white plastic mudguard brackets.
This will ensure that the cable routes correctly & doesn't hit the disc.
Also make sure that the notches in the larger diameter end of the spindle match up with the notches in the fork leg on the offside so you can accessthe suspension adjuster.
Andy