I just started this mess today myself. Someone had been in there before and had everything FUBAR. I got everything out and managed to get the whole "snake" put back together properly (realoem is awesome for diagrams!) Just need to refit the intake manifolds and it should be good! I told the parts guy at my dealership to order me every piece of hose that is anywhere under the intake. Ended up being about $160 when all was said and done, but there is no old rubber left under the intake! For some reason... using OEM parts just seems to always work out better.
Did you bypass your heater plate or did you just repair it back to stock? (I repaired back to stock myself)