What is your idle speed at when it's idling good? My suggestion: up the idle speed another 50 rpm.
My car was similar to what you are describing until I upped the rpm just slight. I think it idles about 750 rpm, which isn't too unreasonable considering the cam.
My idle RPM is already set pretty high, it idles good sometimes round 850 id say, and then sometimes it idles at 1000, it kind of fluctuates, its pretty weird.