Are you in Oakland, CA? I thought they had strict rules about engine swaps...
Anyways, the ignition timing is a relationship between spark and pistion position. You said that it needs to be at 600rpm vs. 800rpm, that is a idle setting.
My $0.02 is take it to a mechanic.