2. Would moving the distributor another notch make things better yet or would it make them worse?
If you have a vacuum gauge, advance the timing to the highest reading at idle. Back it off if it pings. If your motor is built on the wild side, this won't work. You didn't say what cam, carb, ect. your running.