Your are correct with the process of moving the connector pins, A1 is moved from the old connector to F6 of the new connector.

Be patient, sometimes the pins can be stubborn to remove. Having new pins available is a good plan, just in case a stubborn pin is damaged during the removal process and needs to be replaced. The first time I did a conversion I labeled everything. I made masking tape "Flags" to label the wires. I used black ink to label the old connector pin number, then used either blue or red ink on the other side of my masking tape "Flag" to indicate the new connector pin. I used blue ink for the blue connector pins, and red ink for the red connector.

Double check and triple check the connections, before starting the engine.

dave w