I rewired my trailer this last summer.
Here's my tips for you:
1) Do away with all those POS ground to the trailer lights. Get sealed lights that have both the positive and ground wires.
2) Install a junction box up at the front of the trailer. Run your plug wires to the terminals and then run the positive wire from your lights to that appropriate terminal. All your grounds will go to the same spot and ground through the trailer plug and not the trailer.