Matt,

Did you try to set the timing to maximum vacuum at idle?

Can you get your idle down to 500 rpm?