I would seriously consider adding an IAC to your setup. I have this on mine
I'm running the extra code and I control the cold start and idle air with the valve. You really want the butterflies closed at idle and the idle controlled with some sort of air bleed.Â
DIY Autotune has a nice unit from Darkstar that would work really well for you.
Derek