There's a wiring diagram that Nick did for me on my build diary, might be worth a look to see if there's anything you can do differently.