That looks like a pretty clean fix. Please take tons of pics; I'm going to have to tackle mine this summer and I'll need to lean on you guys big time.....
Just finished the soldering trick on my LKM relays (several of the solders were cracked), we'll see what gives. I was whipping along a country road, with no shoulders, in the middle of the night when all of a sudden ...poof, everything went pitch black. Took a few seconds for my eyes to adjust and I managed to stop the car without going into the ditch. Waited a few minutes and restarted the car and the lights worked again. It usually happened during the day but not this time....nearly $hit my pants....