My recommendation to you is to start from scratch as sjesse suggested and moving forward snapshot your golden image at each major steps. That way if something goes wrong you can always revert to a previous snapshot rather than start over from scratch.