Well, one more step forward. I got my new engine harness today. Installed it and the only casualty was a lost coil nut. I also ordered my turn signal switch off eBay, but it won't be here until Thursday. So that means I just need to get everything else finished by Thursday. Then all I will have to do is fight the switch before the Classic on Friday...