My main concern is the snapped off bolt heads. At some point, that pump is going to be loose, correct? I mean right now, I have 3 (or 4?) bolts with snapped off heads. Sure, I MIGHT put it back on as a quick fix though. Fiancee needs the car driveable by Saturday, and I work afternoon-evening tomorrow and friday, and all day saturday and sunday ):

So...these shouldn't be difficult to insert in the new pump? At this point cost is low on my priority, short of paying a shop to do it.

I got the fan shroud cleaned up pretty good, only one side left to clean. It was so grimed and gunked up. Any idea how to get the INSIDE of the overflow clean? I swear it has ages of gunk built up inside. Probably going to soak it with dish soap and water tonight, see if it can cut through it.