I did this job just last year but I sadly I can't recall what went where. Pretty sure I just arranged them in the order they were removed to save me a bit of a headache.
I used the Aisin pump, which apparently according to this
Amazon review, there was a misprint in the TSB included with the pump that explains the design change. Seems like the bolt locations noted by the reviewer there match what the GM manual is showing.