Here's a suggestion, TimO of where I'd look next. Your symptoms could be caused by a leaking vacuum hose. I'd definitely suggest that you carefully inspect them. Some folks suggest spraying FI cleaner or even starting fluid on the hoses and listening for a change in engine RPM. If you feel comfortable doing that, it may help locate any leaks.
CJB
