I used a cut off wheel in the dremel to cut off the blue plastic from all my terminals, then used a industrial crimper to crimp them to the wires (versus just smashing them). I then use short pieces of heat shrink tubing to make the terminal look like original equipment.
The original clips run the wires to the tail lite behind the brace, but as you've seen, the brake light wires were run exposed originally. The problem is made worse since we can't get the original switch (the body of the switch would face the rear). With the switch that's available the wires have to be several inches longer.
Mike Sal