Water pump replacements?

[Mika]

What do you folks use as a replacement water pump for the SVX?

There are two Subaru part codes that seem relevant:
21111AA033 - this pump is with two outlets
21111AA070 - this pump is with three outlets, with one line going to the oil cooler. There's only one picture of this pump in the internet, and the code is not recognized by Subaru but should be a valid FHI code.

So far the two pumps that we've tried are Aisin WPF002 and WPF006.
WPF002 does not fit, and has only one outlet, despite marketed as a replacement pump.
WPF006 roller would leave about half an inch of the timing belt unsupported, looks like it's too short to be used.

I'm aware of GMB160-2050, which seems to be a bit better on how far up the roller reaches. I haven't seen if they have a three outlet version available for the pump.

Any tips and ideas what pump would fit from which vendor? We can probably make do with two outlets. Wouldn't want to reuse the old pump, unless I absolutely have to.