Well I got it put back together and it fired up MUCH better than it has been. We drove it about an hour and shut it down. When we came back out to leave, probably 30-40 minutes later, it started up and started misfiring and had NO POWER. After driving around the parking lot for a little bit it stopped and the power came back and it drove normal. After this we went to eat, stopped again, came back out 45 minutes later and it was doing it'* hard starting crap again, but it wasn't misfiring. We drove it a few minutes and then parked it, shut it off, and turned it right back on and it came on fine. It only seems to act up when it'* been warmed up, then let cool for a little bit.
It does idle much better and doesn't surge like it did before ONCE it'* been started so cleaning the EGR and IAC did help, but just didn't cure the big problem.