A beauitful machine already, congrats.
Only suggestion i can make is concerning the re-wire, take lots of photos, get a coupla books of wire markers and mark all wires before removal, keep a log saying where they go and get a big blow up, in colour, of the wiring schematic.
I am as dumb as a stump,especially electrically but my triumph started right up and all worked perfectly after a re-wire using these tips.
Cheers.
Zig.