$100 to Mark for his time or spend the time to do it yourself? I'm taking the Beetle Map!
I would add to the 12 steps above to go ahead and ditch the stock plug caps for the NGK upgrade. When I bought my bike used the stock caps were already toast and that made the bike stink, darkened up the exhaust cap, and gave terrible performance at lower rpm. $20 solves the issue permanently.