OK, well I just finished soldering and it's worked a treat. I guess we'll see how long term it is, but I think it should do the trick for now at least! In case it helps anyone in the future, I attached a couple of pictures of the soldering job in question. Thanks a lot for all the tips, much appreciated!