Do everything except the Idle Air Control, and run a tank of premium with fuel injector cleaner.
The IAC is working fine.
Chances are the tune-up will fix it (does a '96 even have a distributor?), because a weak spark can cause a rough idle.
Also, when a car warms up it takes over 3 hours for...