I would up your initial timing and than adjust your idle. This should clear it up some. You need to get a timing light on there to figure total as well.