Keith - You can also rebuild yours existing "40217" pump using kits from a number of our usual sources, including ordering a kit from Then and Now Automotive if you're up to a DIY.
Otherwise, check out ebay. There is current listing for a
rebuilt "42017" pump. Pictures in that ad show the correct port layout as mentioned in your details (see screenshot below).