i had a prob with my lights aswell, they worked on sidelights but not on head lights, ended up being the wires to the 2 fuses at the back of the fuse box, the 2 white ones,
ye cant wait till its finished, ive owned the car for 5 years, was gonna restore the shell but not really worth it, was rotten, much better to do what i done, struggled to get a non custom roof cloth, thats what will give it away though, documentsd will say custom but its not got a sunroof no more,