Really nice work Simon, particularly fixing up all those problems.
I recall the pain of transplanting my first Variax electronics into a Strat clone, and all the annoying little problems to resolve. I didn't have things like routers, etc at that stage, and it looked very ugly under the hood, I can tell you....
Finding the extra space inside a Strat body for things that aren't supposed to be there, can be very tricky.