So all done as of last weekend (GreggPDX was there to help out and much needed second set of eyes). Car is really running MUCH stronger now - had many leaks, old diverters, leaky/separated suction...