Thanks for the words of support! I was feeling a bit down, so much work, and so close but so far away.
You're right of course, will almost certainly be a bad trace - I need to stop freaking out, be patient, and go back to basics - not shotgun replace parts on a wing and a prayer :-)