So I opted to go ahead and buy the pump linked by Paul1958. Didn't really want to spend the extra $$, but I figure we're all set for a long time to come.

The RockAuto discount code on the forum at least helped offset shipping costs.