I would also try a good earth for the solenoid, mine would not do much more than click when i refitted it, turned out to be a bad earth from the solenoid.
Also just notice on the pic, are you getting contact/short between F1 & F2 on the solenoid . maybe worth a look?
Good luck, i hate electrics...