Just finished this up. The pictures do not do justice to just how cramped the space really is. It's totally doable but you can't brute force anything... It's definitely a "finesse" DIY.
My tip... I removed the radiator fan and had a much easier time removing the thermostat and removing that top bolt off the water pump. I would highly recommend doing this as it takes all of 10-15 min to take out the radiator fan and those few inches of space go a long way.
Also... If you are struggling getting the power harness back onto the water pump, make sure the hose clamp on the neighboring hose is not in the way... That one took way too long to figure out.
Thanks for the great write up! You saved me $500.