So just an update...
I received the OEM PI Intake kit yesterday, as well as the new heater return pipe.
I saw some information where some people advised changing the heater core hoses as well as the PI coolant nipple.
I wanted to change all that is necessary while doing this job since I don't currently have to drive the vehicle everyday.
I plan on starting the fix next weekend, just wanted to ask for more opinions.