I plan on attacking mine this Saturday.
Rather than solder anything I'm planning on using male/female spade connectors - that way the next time it fails I can just disconnect and reconnect the various parts.
I'll let you know if I succeed.