I'm done! Wearing the socks now. The fix using a different yarn really worked. For some reason it took me forever to finish the toe (kept making mistakes and going back), but now I'm blissfully done :)
I hope to get some good pictures tomorrow and also of the finished Tomten Jacket, it has zipper now :) I'll tell you all about it later.