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.
X2 Get new lights and wires in a kit. You will save your self a lot of grief that way.
Get the waterproof ones if you can.
Lund Rebel XL 1625 Merc 60 4 stroke
Yamaha T8 Lowrance HDS 5
Minn Kota 70lb I Pilot 60"