You did well in upgrading the wiring quality but as silverface mentioned, give the pickups a chance. You could be surprised. I have been more than a few times. Sit in with your luthier friend & nail down that neck set. You can have a great playing guitar if you get those right. Who wants to spend weeks/months putting one together only to have it hang on the wall with issues?