I have heard the headgaskets are very good on these motors and a upper or lower intake can mimmmic a head gasket failure. That's why I'm leaning toward that. Looked At the coolant elbows and they look good. That's crazy the 07 has the plastic lim gaskets.