What's the approximate compression ratio? You said .030 over with stock heads. Are they stock replacement pistons? If so, that means 8.5:1 max, so you can pull in probably up to 20* initial timing or more. Try that and see if it cleans up anymore. Of course, you'll need to limit your total timing to about 36* and all in by about 2500.