sorry for the delayed response. Try 0388685 for an oem fuel pump replacement.
While it's true that final needle adjustments need to be made on the lake (h.s. adjustment at WOT or thereabouts), you can get close at lower rpms -- then hit the lake. I think testing with a known good fuel pump is probably a good start. There are pumps similar to the oem model above for much less money. Sierra is less (check here at iBoats).
I bought a couple of foreign knock off pumps for about $20/ea (maybe less -- don't quite recall), and have had no issues. I think of them as throw-aways if they fail (i.e., keep for parts).