with the timing you may need an adjustable light to be able to see where your sitting at idle, could be that its flashing around 16+ which is hard for a normal light to pick up on
You could also hold it at 3000 RPM, and set the timing at 32 degrees there. you should be well fully advanced by that point. tighten it down there, then check it at idle. as long as its running ok, and isn't idling more than 14 or 15...i'd leave it.
