Hi, I have an 07 classic, I can't help with the map but mine was cutting out every now and then, it turned out to be an ignition wire. Next time it happens lift the tank and feel the large connecting block with seven wires in it. Mine was hot and one of the wires was breaking down inside the block. I had to cut out the connector and solder all the wires together.
you should fit the eastern beaver headlight relay kit if it hasn't already been done to save you more grief later.