You def dont want to do 1 again. You have to start with 2. Im getting ready to hit the sack. But if you head over to the thread ive linked to in the OP you should be able to find support for you issue man. Im sorry but im exhausted.
Good luck. Dont freak out, your pretty much one step from being completely rooted and at this point the state your in isnt going to hurt anything.