Well, it may be fixed. I replaced the ICM and the Coil last week. I don't know which part was the problem, I broke the last tab on the old coil while replacing the ICM. Doh! Anyway, I drove it to/from work Friday, yesterday, and today and it has been running like a top. No stalling or bucking. I will be fully convinced the issue is solved after a week or so.
Thanks to everyone for their help, it is much appreciated.