Rather than just a good pump, what about more "information" under the lid? A decent fuel pressure gauge with a quality regulator. A good regulator won't pressure climb whilst idling, and will reduce vapour lock situations.
As to fuel pumps - we can still get rebuild kits here (lucky us!), so there's a little more choice if you really want to go that way.
Regards, Adam.