Quick update - got the front end tore off the car - so that I can run the intercooler, the IC pump, and the hoses for it. I'll start on that project tomorrow.
I also had to make a tool to tighten up the water pump bolts. The Edelbrock kit uses a bracket that ties into the passenger side water pump bolts - and there hardware is a 6MM Hex head. My standard length H6 socket wouldn't fit in the bracket - so I went to Lowes and got an H6 6" socket - I ended up cutting probably 4" or so off of the socket - and hit each side with my angle grinder until it fit. You could pull the fan out of the car - and it might fit but I needed a tool incase I needed an emergency fix - I will not pull the fan every time I need to pull the water pump. I know I ruined the hardened steel by cutting it - but those WP bolts only go to 18-22 ft lbs and it tightened them with no issue.
Now for some pics: