Nice write up indeed. I've had a similar issue except it happened 350 miles away from home on the Canadian border.
Ended up getting the OEM pump cause I didn't know any better. But the old one is still sitting in the garage.
Gonna have to spruce it up to have as back up.