I decided to go ahead and just frog the black scarf back to a pile of yarn and start it over from scratch. I only had about a foot of it done anyway and it just seemed easier to frog it all as to try and frog back to a good point, pick up the stitches again (I'm not very good at that yet) and figure out exactly where in the pattern I was picking up from.
So now I'll just have to start it all over again, hopefully sans mistakes this time around. I may go ahead and do the hat for the bartender before starting it again as the hat is a pretty quick project.