For me, cooling is always first if the car is in running condition. Then I do all the fun stuff. I'm a bit paranoid on the Y connector. I'd go over the cooling system if I suspect anything is over 5 years old for replacement consideration. Preventive maintenance for me since I had my cooling lesson already.
Lucky motor swaps are easy on these cars.