You should also go to your local bolt house and get new bolts, as the ones you had a hard time removing have already been involved in a bi-metalic siezure.
I'm hoping the top bolts come with the new pump as they are inside the outline on the parts fiche for the assembly. I'll see if I can source the lower bolts locally.