Looks like you have it all pretty well covered.
Just wanted to note after the first two or three of these I started to suction out the p/s fluid, remove the p/s fluid return hose, then the p/s fluid resavour. That allows you to just remove the nesassary p/s pump bolts and just pivot it out of the way and have lots of room to get the bolt w/pump bolts back in too.

Hope you get it back on the road soon.