800 rpm is way over normal idle speed .
If it wont idle at 450 - 500 them there is still a little bit of that crud in the idle circuit.
The dist is easy to fit up 180 deg out , 'cause the oil pump drive is a slot. If it starts ok , just leave it . So what if the wires are in a funny place .