buy a trailer wiring kit and do the whole thing over, that way everything will be new and in good condition. sounds like too much jury rigging and somewhere there are crossed wires.