After checking the leaks using the carb cleaner, I finally just ordered the BMW part for the 90 degree hose that goes from the ICV to the engine as well as a new throttle body gasket.
As I was taking out the throttle body gasket, I realized that I had pinched that little hose from the engine to the bottom of the throttle body. DOH!
After cleaning all of that up and using the BMW 90 degree hose, the idle runs a lot more smooth.
However, it does still surge a bit between 700-900 rpm and the check engine light comes on during these times. It immediately goes away upon revving the engine up though. I can live with it at this point though, especially if I'm looking towards an engine swap, possibly in the near future.
Thanks again for all of the help and suggestions. I'll be posting up a thread seeking some more advice on having a shop do an oddball engine swap (F22c).