Yes, just went through this myself. I did three things, all of them suggested to me by various members of this forum
a) work the tail-light wire cluster as it runs underneath the rear fender, so that you have some slack in the 3 wires as they come into the taillight socket.
b) in the headlight bucket, disconnect the parking light plug, it's a connection with two wires that run to the socket direcly underneath the headlight. This light isn't used in the US anyways.
c) visually inspect all the wires that run into the headlight bucket to make sure that none of the insulation has been chaffed off. Refit the rubber ring, and reinforce the wires with electrical tape as necessary.
I did these things, and my fuse popping probs went away, hope this helps you out.