Hey man, I know this post is old but I'm new to the forum and might be able to help you out with some electrical assistance if you still need it?
I just bought a buggy and am doing a resto which will require a whole new wiring loom but I do that kind of thing for a living so sure I can help you out in some way if you're local to Vancouver/Fraser Valley
Max